From: Lady Date: Sat, 26 Oct 2024 20:32:03 +0000 (-0400) Subject: Fix multi‐stage exclusion of [$%] in file·names X-Git-Tag: 0.13.1~1 X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/75c707bcd858a98be2286253e2c010350d4db8a7?ds=inline Fix multi‐stage exclusion of [$%] in file·names 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. --- diff --git a/GNUmakefile b/GNUmakefile index 77185a5..d0e4346 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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. -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. -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 ─────────────────────────────────────