X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=dd6df29451ba1327f63055f57945c007a73aa566;hp=ca54f944d13cf5011df25c77e4ca86f3c5af5821;hb=ee295f5f320fc8db7f789da3198a751b1cc7ddd3;hpb=61f8c1504443809e6a86217bc8f35ba9c1b7ab5f

diff --git a/generate b/generate
index ca54f94..dd6df29 100755
--- a/generate
+++ b/generate
@@ -137,22 +137,25 @@ sub process_input_mk ($$$$$$$$$) {
     }
     $input_files{$f}++;
 
+    my %srcdirmap = (
+		  '^' => "\$(top_srcdir)${dir_suffix}",
+		  '~' => "\$(top_srcdir)",
+		    );
     my %pfxmap = (
 		  ''  => $dir_prefix,
-		  '^' => "\$(top_srcdir)${dir_suffix}/",
-		  '~' => "\$(top_srcdir)/",
 		 );
+    $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
 	    $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);
@@ -161,9 +164,10 @@ sub process_input_mk ($$$$$$$$$) {
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
 	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
 	    elsif (s{^_}{}) { o $var_prefix }
-	    elsif (s{^=_}{}) { o $var_prefix }
+	    elsif (s{^=}{}) { o $var_prefix_name }
 	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
-	    elsif (s{^=/}{}) { o $dir_name }
+	    elsif (s{^\.}{}) { o $dir_name }
+	    elsif (s{^([~^])\.}{}) { o $srcdirmap{$1} }
 	    elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die;
 		my $after='';