aboutsummaryrefslogtreecommitdiff
path: root/sources/master
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2014-05-13 21:31:52 +0200
committerJochen Topf <jochen@topf.org>2014-05-13 21:31:52 +0200
commitdafa3e2afd201f19c2f7653142f3a36e2bba243a (patch)
tree0ff85296a0157fbbe84b6e4dceb14871d92b18f8 /sources/master
parentb7bebb4060149235ec29beb6ac9c076f763ebdef (diff)
downloadtaginfo-dafa3e2afd201f19c2f7653142f3a36e2bba243a.tar
taginfo-dafa3e2afd201f19c2f7653142f3a36e2bba243a.tar.gz
Add --prefix-builtins option to calls to m4 command.
This effectively disables built-in macros that can mess up the result.
Diffstat (limited to 'sources/master')
-rwxr-xr-xsources/master/update.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/sources/master/update.sh b/sources/master/update.sh
index d262ba1..8d49af9 100755
--- a/sources/master/update.sh
+++ b/sources/master/update.sh
@@ -25,13 +25,13 @@ SELECTION_DB=$DIR/selection.db
echo "`$DATECMD` Create search database..."
rm -f $DIR/taginfo-search.db
-m4 -D __DIR__=$DIR search.sql | sqlite3 $DIR/taginfo-search.db
+m4 --prefix-builtins -D __DIR__=$DIR search.sql | sqlite3 $DIR/taginfo-search.db
echo "`$DATECMD` Create master database..."
rm -f $MASTER_DB
sqlite3 $MASTER_DB <languages.sql
-m4 -D __DIR__=$DIR master.sql | sqlite3 $MASTER_DB
+m4 --prefix-builtins -D __DIR__=$DIR master.sql | sqlite3 $MASTER_DB
echo "`$DATECMD` Create selection database..."
@@ -40,7 +40,8 @@ min_count_for_map=`../../bin/taginfo-config.rb sources.master.min_count_for_map
min_count_relations_per_type=`../../bin/taginfo-config.rb sources.master.min_count_relations_per_type 100`
rm -f $SELECTION_DB
-m4 -D __DIR__=$DIR \
+m4 --prefix-builtins \
+ -D __DIR__=$DIR \
-D __MIN_COUNT_FOR_MAP__=$min_count_for_map \
-D __MIN_COUNT_TAGS__=$min_count_tags \
-D __MIN_COUNT_RELATIONS_PER_TYPE__=$min_count_relations_per_type \
@@ -52,7 +53,7 @@ if [ ! -e $HISTORY_DB ]; then
sqlite3 $HISTORY_DB < history_init.sql
fi
-m4 -D __DIR__=$DIR history_update.sql | sqlite3 $HISTORY_DB
+m4 --prefix-builtins -D __DIR__=$DIR history_update.sql | sqlite3 $HISTORY_DB
# Remove old *.lst files. This is only temporary and can be removed once
# everybody has the new version which doesn't create these files any more