use config tool as submodule

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..b80b8b3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "config"]
+       path = config
+       url = ../../botm/config

diff --git a/config b/config
new file mode 160000 (submodule)
index 0000000..1c21433
--- /dev/null
+++ b/config
@@ -0,0 +1 @@
+Subproject commit 1c21433837c5bc34100f04bbfeb8ce403844e91d

diff --git a/makefile b/makefile
index aaef9dc65318ff3b70c75bd05f3008f8183afcf8..5d203dcbcb8a257fb4ab907ad443674a6f31a416 100644 (file)
--- a/makefile
+++ b/makefile
@@ -29,6 +29,7 @@ TARGET    =release
 # when want to change target run this first:
 # make -B TARGET=target_name makefile
 endif
+PERL = perl
 
 CONFIGFILE = settings-$(TARGET).txt settings.txt
 
@@ -65,8 +66,7 @@ CRON = /etc/cron.d/ottmirror
 
 # The configuration tool
 # http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE =/botm/bin/config/configure.pl
-CONFIGURE_CMD = $(PERL) $(CONFIGURE) $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
@@ -228,10 +228,14 @@ $(MEM_POST_PATH)
 all: $(TO_GENERATE) $(C) $(C_CGI)
        
 
-makefile: makefile.1.mak $(CONFIGFILE)
+makefile: makefile.1.mak $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) < makefile.1.mak > makefile 
 
-$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
+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
+
+
+$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
 $(C): %: %.c
@@ -275,7 +279,7 @@ install: cp_bin cp_www cp_www_desc cp_src cp_conf cp_cron
        
 
 clean:
-       $(RM) -f $(TO_GENERATE) $(C) $(C_CGI)
+       $(RM) -f configure.pl $(TO_GENERATE) $(C) $(C_CGI)
 
 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 f1449fa95f83a51635e9731a33ea7b708b4b73bb..96a32bfb8430a59fa1881f989f6f647f8a5c0d2d 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -29,6 +29,7 @@ TARGET = debug ###MAKE_TARGET:
 # when want to change target run this first:
 # make -B TARGET=target_name makefile
 endif
+PERL = perl
 
 CONFIGFILE = settings-$(TARGET).txt settings.txt
 
@@ -65,8 +66,7 @@ CONFIGFILE = settings-$(TARGET).txt settings.txt
 
 # The configuration tool
 # http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE = /botm/bin/config/configure.pl ###MAKE_CONFIGURE:
-CONFIGURE_CMD = $(PERL) $(CONFIGURE) $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
@@ -228,10 +228,14 @@ $(MEM_POST_PATH)
 all: $(TO_GENERATE) $(C) $(C_CGI)
        
 
-makefile: makefile.1.mak $(CONFIGFILE)
+makefile: makefile.1.mak $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) < makefile.1.mak > makefile 
 
-$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
+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
+
+
+$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
 $(C): %: %.c
@@ -275,7 +279,7 @@ install: cp_bin cp_www cp_www_desc cp_src cp_conf cp_cron
        
 
 clean:
-       $(RM) -f $(TO_GENERATE) $(C) $(C_CGI)
+       $(RM) -f configure.pl $(TO_GENERATE) $(C) $(C_CGI)
 
 PHONY: all clean setuid mktree cp_bin co_conf cp_cron cp_src cp_www cp_www_desc install
 

diff --git a/settings-release.txt b/settings-release.txt
index cdfec61c05c73f4e69ccd301cb6748ddaa6b3e98..fc6a3ae37839d5f5ebe74abfed86ff5694c09264 100644 (file)
--- a/settings-release.txt
+++ b/settings-release.txt
@@ -6,10 +6,6 @@ name: ottmirror
 # where TARGET_NAME is the value
 target: release
 
-# The configuration tool
-# http://bicyclesonthemoon.info/git/botm-config 
-# alternatively, copy configure.pl to source directory.
-configure: /botm/bin/config/configure.pl
 
 useragent2: bothasar_t (http://1190.bicyclesonthemoon.info/ott/; Time thread mirror bot)
 useragent3: bothasar_p (http://1190.bicyclesonthemoon.info/ott/; Time thread post bot)