X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=subdirmk%2Fgenerate;fp=subdirmk%2Fgenerate;h=f46747da641acb3e0bb1847af7714fe548dceb19;hb=c5e7d25834b006913962da9251ab4330fe3961fc;hp=b4c52ae40073c1c3cca1b3026a2c52595e1d9851;hpb=2226fa7498d1aafa57fb9d23a35d96089acbdfa2;p=secnet.git

diff --git a/subdirmk/generate b/subdirmk/generate
index b4c52ae..f46747d 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -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.$'); }