]> Lady’s Gitweb - Shushe/commitdiff
Fix multi‐stage exclusion of [$%] in fileΒ·names
authorLady <redacted>
Sat, 26 Oct 2024 20:32:03 +0000 (16:32 -0400)
committerLady <redacted>
Sat, 26 Oct 2024 20:35:27 +0000 (16:35 -0400)
Make interprets the dollar signs in commandline variable assignments as
variable references, so they need to be escaped (doubled) when
forwarding values to a submake thru the commandline.

GNUmakefile

index 77185a50766a2a097b9e4f68c6a9446b40029141..d0e4346fc6fb7a16212a372ab021f8739a253e29 100644 (file)
@@ -789,10 +789,10 @@ else ifeq ($(MODE),urn:fdc:ladys.computer:20231231:Shu1She4:mode:_2stage)
 override makefile := $(abspath $(THISDIR)/GNUmakefile)
 
 # (overridable) Options to use when calling β›©πŸ“° δΉ¦η€Ύ the first time.
 override makefile := $(abspath $(THISDIR)/GNUmakefile)
 
 # (overridable) Options to use when calling β›©πŸ“° δΉ¦η€Ύ the first time.
-shushedataopts := INCLUDEDIR=$(call quote,$(DATADIR)) BUILDDIR=$(call quote,$(BUILDDIR)/data) FINDRULES=$(call quote,$(FINDRULES) -a '(' $(FINDDATARULES) ')') FINDINCLUDERULES=$(call quote,$(FINDINCLUDERULES)) MODE='urn:fdc:ladys.computer:20231231:Shu1She4:mode:default'
+shushedataopts := INCLUDEDIR=$(call quote,$(DATADIR)) BUILDDIR=$(call quote,$(BUILDDIR)/data) FINDRULES=$(subst $$,$$$$,$(call quote,$(FINDRULES) -a '(' $(FINDDATARULES) ')')) FINDINCLUDERULES=$(subst $$,$$$$,$(call quote,$(FINDINCLUDERULES))) MODE='urn:fdc:ladys.computer:20231231:Shu1She4:mode:default'
 
 # (overridable) Options to use when calling β›©πŸ“° δΉ¦η€Ύ the second time.
 
 # (overridable) Options to use when calling β›©πŸ“° δΉ¦η€Ύ the second time.
-shushesiteopts := INCLUDEDIR=$(call quote,$(INCLUDEDIR) $(BUILDDIR)/data/public) BUILDDIR=$(call quote,$(BUILDDIR)/site) FINDRULES=$(call quote,$(FINDRULES) -a '!' '(' $(FINDDATARULES) ')') FINDINCLUDERULES=$(call quote,$(FINDINCLUDERULES)) MODE='urn:fdc:ladys.computer:20231231:Shu1She4:mode:default'
+shushesiteopts := INCLUDEDIR=$(call quote,$(INCLUDEDIR) $(BUILDDIR)/data/public) BUILDDIR=$(call quote,$(BUILDDIR)/site) FINDRULES=$(subst $$,$$$$,$(call quote,$(FINDRULES) -a '!' '(' $(FINDDATARULES) ')')) FINDINCLUDERULES=$(subst $$,$$$$,$(call quote,$(FINDINCLUDERULES))) MODE='urn:fdc:ladys.computer:20231231:Shu1She4:mode:default'
 
 # β”€ ΒΆ Recipe Variable Definitions β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€
 
 
 # β”€ ΒΆ Recipe Variable Definitions β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€
 
This page took 0.055744 seconds and 4 git commands to generate.