}
$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);
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='';