update config; drop unneeded oldlogs.1.pl

[ott/bsta] / makefile

diff --git a/makefile b/makefile
index f3a12cd825c616c8f5ba4db3070453f78d703102..e0608aef2bffc5587bc437926e652c81d6f1ba16 100644 (file)
--- a/makefile
+++ b/makefile
@@ -48,7 +48,7 @@ CONFIGFILE = settings-$(TARGET).txt settings.txt
 DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt
 
 # The configuration tool
-CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE)
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
@@ -156,13 +156,13 @@ makefile: makefile.1.mak $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) < makefile.1.mak > makefile
 
 configure.pl: $(CONFIGFILE) config/configure.1.pl
-       $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
+       $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
 
 $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
+       $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
 $(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt configure.pl
-       $(PERL) configure.pl path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c
+       $(PERL) configure.pl --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c
        $(CC) $(CF) -o $@ $*.c
 
 exec: $(EXEC)
@@ -204,7 +204,7 @@ install: all cp_bin cp_lib cp_www cp_conf cp_cron
 
 clean:
        $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)
-       $(PERL) config/configure.1.pl $(DEFAULT_CONFIGFILE) < makefile.1.mak > makefile
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) < makefile.1.mak > makefile
 
 PHONY: all clean install setuid exec mktree cp_bin cp_lib cp_www cp_conf cp_cron