X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=dd6df29451ba1327f63055f57945c007a73aa566;hp=ba66f8677fba472bc90a7ddd44b42693ab1b632a;hb=b809edc47e57f527900230cd744352faec4411c5;hpb=503a7e5169b4a18e2ad2569daeb9e13a99f21070

diff --git a/generate b/generate
index ba66f86..dd6df29 100755
--- a/generate
+++ b/generate
@@ -151,11 +151,11 @@ sub process_input_mk ($$$$$$$$$) {
 	    $buffering_output='';
 	}
 	for (;;) {
-	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
+	    unless (s{^(.*?)$esc}{}) { o $_; last; }
 	    o $1;
-	    if ($2) { s#^$esc##; o $$esclitr; next; }
-	    s{^$esc}{} or die "$_ ?";
-	    if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
+	    if (s{^\\$esc}{}) { o "$$esclitr" }
+	    elsif (s{^\\\$}{}) { o '$' }
+	    elsif (s{^$esc}{}) { o "$$esclitr$$esclitr" }
 	    elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
 		my $t = $1 // 'all';
 		o target_varname($var_prefix, $t);