X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=f46747da641acb3e0bb1847af7714fe548dceb19;hp=0bb4b7b3501014b9696e782b95c3186494113c51;hb=1e59a1940a98b26cb77913424f6da767646bcce4;hpb=f51d1785a6b1266cc4aa475b53930e673b46f98e

diff --git a/generate b/generate
index 0bb4b7b..f46747d 100755
--- a/generate
+++ b/generate
@@ -131,6 +131,12 @@ sub process_input_mk ($$$$$$$$) {
     }
     $input_files{$f}++;
 
+    my %pfxmap = (
+		  ''  => $dir_prefix,
+		  '^' => "\$(top_srcdir)${dir_suffix}/",
+		  '~' => "\$(top_srcdir)/",
+		 );
+
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
 	    $buffering_output='';
@@ -147,19 +153,13 @@ sub process_input_mk ($$$$$$$$) {
 		$targets->{$t} //= [ ];
 	    }
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
-	    elsif (m{^(?=$lc_re)}) { o $dir_prefix }
+	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
 	    elsif (s{^_}{}) { o $var_prefix }
-	    elsif (s{^/}{}) { o $dir_prefix }
 	    elsif (s{^=_}{}) { o $var_prefix }
+	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
 	    elsif (s{^=/}{}) { o $dir_name }
-	    elsif (s{^\^}{}) { o "\$(top_srcdir)${dir_suffix}" }
-	    elsif (s{^\}}{}) { o "\$(abs_top_srcdir)${dir_suffix}" }
-	    elsif (s{^(?:[ \t]+([~^]))?(?=[ \t])}{}) {
-		my $prefix =
-		    !$1       ? $dir_prefix                     :
-		    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :
-		    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :
-		    die;
+	    elsif (s{^([~^]?)(?=[ \t])}{}) {
+		my $prefix = $pfxmap{$1} // die;
 		my $after='';
 		if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;