X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=dd22146339b130fc6ffbb7efdd9ab3ce0ccc8515;hp=b4c52ae40073c1c3cca1b3026a2c52595e1d9851;hb=6fce06f32c1dd21b5c2d7a142d54b7153d650574;hpb=f5a41a874d98a44c36040aa74e6be685628baf70

diff --git a/generate b/generate
index b4c52ae..dd22146 100755
--- a/generate
+++ b/generate
@@ -99,12 +99,12 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-%:	FORCE-ALWAYS-RUN
+\$(MAKECMDGOALS) all: run-main.mk
 	\@:
-Makefile FORCE-ALWAYS-RUN:
+Makefile run-main.mk:
 	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
 .SUFFIXES:
-.PHONY:	FORCE-ALWAYS-RUN
+.PHONY:	run-main.mk
 END
 }
 
@@ -133,8 +133,8 @@ sub process_input_mk ($$$$$$$$) {
 
     my %pfxmap = (
 		  ''  => $dir_prefix,
-		  ',' => "\$(top_srcdir)${dir_suffix}/",
-		  ';' => "\$(top_srcdir)/",
+		  '^' => "\$(top_srcdir)${dir_suffix}/",
+		  '~' => "\$(top_srcdir)/",
 		 );
 
     while (<$input>) {
@@ -153,12 +153,12 @@ sub process_input_mk ($$$$$$$$) {
 		$targets->{$t} //= [ ];
 	    }
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
-	    elsif (s{^([,;]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
+	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
 	    elsif (s{^_}{}) { o $var_prefix }
 	    elsif (s{^=_}{}) { o $var_prefix }
-	    elsif (s{^([,;]?)/}{}) { o $pfxmap{$1} }
+	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
 	    elsif (s{^=/}{}) { o $dir_name }
-	    elsif (s{^([,;]?)(?=[ \t])}{}) {
+	    elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die;
 		my $after='';
 		if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }