From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 00:00:02 +0000 (+0000)
Subject: subdirmk: Make \& work (!)
X-Git-Tag: v0.5.1~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=163a6e361847c3f3f63f6756a143035753d5e151

subdirmk: Make \& work (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile.in b/Subdir.sd.mk
similarity index 100%
rename from Makefile.in
rename to Subdir.sd.mk
diff --git a/configure.in b/configure.ac
similarity index 100%
rename from configure.in
rename to configure.ac
diff --git a/subdirmk/generate b/subdirmk/generate
index 486bdc5..14e18c0 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -138,7 +138,7 @@ sub process_input_mk ($$$$$$$$) {
 	for (;;) {
 	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
 	    o $1;
-	    if ($2) { o $$esclitr; next; }
+	    if ($2) { s#^$esc##; o $$esclitr; next; }
 	    s{^$esc}{} or die "$_ ?";
 	    if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
 	    elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {