X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=48db65246e79683812062458da23e654ac1c0a98;hp=486bdc54e1c888b7be9cee539918296651cc8010;hb=172580f2d7fb712f40e036c1417718b443e4adb9;hpb=25a516a59e7811b8626b5fe40b49c5ef942db697

diff --git a/generate b/generate
index 486bdc5..48db652 100755
--- a/generate
+++ b/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)}{}) {
@@ -264,14 +264,16 @@ sub process_tree() {
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
 	o "$v=\@$v@\n";
     }
-    o "MAKEFILES += Subdir.mk\n";
+    o "MAKEFILES :=\n";
+    o "MAKEFILE_TEMPLATES :=\n";
+    o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
     foreach my $subdir (@subdirs) {
-	o "MAKEFILES += $subdir/Subdir.mk\n";
+	o "SUBDIRMK_MAKEFILES += $subdir/Subdir.mk\n";
     }
     foreach my $input (sort keys %input_files) {
 	o "MAKEFILE_TEMPLATES += $input\n";
     }
-    o "include \$(MAKEFILES)";
+    o "include \$(SUBDIRMK_MAKEFILES)";
 }
 
 build_tree();