use newer config tool

diff --git a/config b/config
index 3e18191282d9ddf49ba5aceadd81414c37a63634..fc9affec336a16cde93b2675a836bdd01d1c2210 160000 (submodule)
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit 3e18191282d9ddf49ba5aceadd81414c37a63634
+Subproject commit fc9affec336a16cde93b2675a836bdd01d1c2210

diff --git a/makefile b/makefile
index 429ef33d041358d5a6fa95dd80e2e69e43548437..432873dccd6514b3cf9dc8f351662339548c8b33 100644 (file)
--- a/makefile
+++ b/makefile
@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU Affreo General Public License
 # along with OTT mirror. If not, see <http://www.gnu.org/licenses/>.
 
-# TODO: create a debug target and make it default
 DEFAULT_TARGET = debug
 ifndef TARGET
 TARGET    =debug
@@ -36,7 +35,7 @@ DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt
 
 # The configuration tool
 # http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE)
 
 
 PERL =/usr/bin/perl
@@ -259,10 +258,10 @@ all: $(TO_GENERATE) $(C) $(C_CGI)
        
 
 makefile: makefile.1.mak $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) < makefile.1.mak > makefile 
+       $(CONFIGURE_CMD) --in makefile.1.mak --out 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
@@ -310,7 +309,7 @@ install: cp_bin cp_www cp_www_desc cp_src cp_conf cp_cron
 
 clean:
        $(RM) -f configure.pl $(TO_GENERATE) $(C) $(C_CGI)
-       $(PERL) config/configure.1.pl $(DEFAULT_CONFIGFILE) < makefile.1.mak > makefile
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile
 
 PHONY: all clean setuid mktree cp_bin co_conf cp_cron cp_src cp_www cp_www_desc install
 

diff --git a/makefile.1.mak b/makefile.1.mak
index 8104ac1648d2ba14cb1f8a46dab71cd5c2d43b7d..2aafae0ade7e216a907e9eb19d9b9e4c7b3790f0 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU Affreo General Public License
 # along with OTT mirror. If not, see <http://www.gnu.org/licenses/>.
 
-# TODO: create a debug target and make it default
 DEFAULT_TARGET = debug
 ifndef TARGET
 TARGET = $(DEFAULT_TARGET) ###MAKE_TARGET:
@@ -36,7 +35,7 @@ DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt
 
 # The configuration tool
 # http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE)
 
 
 ###MAKE_PERL:  PERL  = perl
@@ -259,10 +258,10 @@ all: $(TO_GENERATE) $(C) $(C_CGI)
        
 
 makefile: makefile.1.mak $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) < makefile.1.mak > makefile 
+       $(CONFIGURE_CMD) --in makefile.1.mak --out 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
@@ -310,7 +309,7 @@ install: cp_bin cp_www cp_www_desc cp_src cp_conf cp_cron
 
 clean:
        $(RM) -f configure.pl $(TO_GENERATE) $(C) $(C_CGI)
-       $(PERL) config/configure.1.pl $(DEFAULT_CONFIGFILE) < makefile.1.mak > makefile
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile
 
 PHONY: all clean setuid mktree cp_bin co_conf cp_cron cp_src cp_www cp_www_desc install
 

diff --git a/ottmirror.1.conf b/ottmirror.1.conf
index 442e12a4ac9ff2a5afa6b34d5e56e8dfd9439558..8f5824886f0f458abb902cfc93b2004db3598afa 100644 (file)
--- a/ottmirror.1.conf
+++ b/ottmirror.1.conf
@@ -27,5 +27,4 @@ ScriptAliasMatch ^###CONF_cgi;/?$ ###CONF_bin_index;
 </Directory>
 
 # legacy redirections
-# TODO: no hardcode here
 Redirect permanent ###CONF_cgi_src; http://bicyclesonthemoon.info/git-projects?p=ott/mirror;