From: b <rowerynaksiezycu@gmail.com>
Date: Fri, 23 Feb 2024 22:38:51 +0000 (+0000)
Subject: use newer config tool
X-Git-Url: http://bicyclesonthemoon.info/git-projects/?a=commitdiff_plain;h=f8fcca13efccaa84b4258aa1c101093d64ab072c;p=botm%2Foldlogs

use newer config tool
---

diff --git a/config b/config
index cc70d0d..fc9affe 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit cc70d0da5dd780e2b7b97672cc0638fd91196ee3
+Subproject commit fc9affec336a16cde93b2675a836bdd01d1c2210
diff --git a/makefile b/makefile
index f702897..9c79e8c 100644
--- a/makefile
+++ b/makefile
@@ -37,7 +37,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=\
@@ -69,7 +69,7 @@ all: $(BIN) exec
 	
 
 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
@@ -102,7 +102,7 @@ install: all cp_bin cp_lib
 
 clean:
 	$(RM) -f configure.pl $(TO_GENERATE)
-	$(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 install exec mktree cp_bin cp_lib
 	
diff --git a/makefile.1.mak b/makefile.1.mak
index 496f8cf..9177240 100644
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -37,7 +37,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=\
@@ -69,7 +69,7 @@ all: $(BIN) exec
 	
 
 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
@@ -102,7 +102,7 @@ install: all cp_bin cp_lib
 
 clean:
 	$(RM) -f configure.pl $(TO_GENERATE)
-	$(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 install exec mktree cp_bin cp_lib