Syntax: Introduce &. and friends

[subdirmk.git] / generate

diff --git a/generate b/generate
index ca54f944d13cf5011df25c77e4ca86f3c5af5821..ba66f8677fba472bc90a7ddd44b42693ab1b632a 100755 (executable)
--- a/generate
+++ b/generate
@@ -137,11 +137,14 @@ sub process_input_mk ($$$$$$$$$) {
     }
     $input_files{$f}++;
 
     }
     $input_files{$f}++;
 

+    my %srcdirmap = (
+                 '^' => "\$(top_srcdir)${dir_suffix}",
+                 '~' => "\$(top_srcdir)",
+                   );

     my %pfxmap = (
                  ''  => $dir_prefix,
     my %pfxmap = (
                  ''  => $dir_prefix,

-                 '^' => "\$(top_srcdir)${dir_suffix}/",
-                 '~' => "\$(top_srcdir)/",

                 );
                 );

+    $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;

 
     while (<$input>) {
        if (s#^\s*$esc\:##) {
 
     while (<$input>) {
        if (s#^\s*$esc\:##) {


@@ -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 (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 $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='';
            elsif (s{^([~^]?)(?=[ \t])}{}) {
                my $prefix = $pfxmap{$1} // die;
                my $after='';