chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subdirmk: Go back to ^ and ~
[secnet.git]
/
generate
diff --git
a/generate
b/generate
index b4c52ae40073c1c3cca1b3026a2c52595e1d9851..f46747da641acb3e0bb1847af7714fe548dceb19 100755
(executable)
--- a/
generate
+++ b/
generate
@@
-133,8
+133,8
@@
sub process_input_mk ($$$$$$$$) {
my %pfxmap = (
'' => $dir_prefix,
my %pfxmap = (
'' => $dir_prefix,
- '
,
' => "\$(top_srcdir)${dir_suffix}/",
- '
;
' => "\$(top_srcdir)/",
+ '
^
' => "\$(top_srcdir)${dir_suffix}/",
+ '
~
' => "\$(top_srcdir)/",
);
while (<$input>) {
);
while (<$input>) {
@@
-153,12
+153,12
@@
sub process_input_mk ($$$$$$$$) {
$targets->{$t} //= [ ];
}
elsif (m{^(?=$caps_re)}) { o $var_prefix }
$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 $var_prefix }
elsif (s{^=_}{}) { o $var_prefix }
- elsif (s{^([
,;
]?)/}{}) { o $pfxmap{$1} }
+ elsif (s{^([
~^
]?)/}{}) { o $pfxmap{$1} }
elsif (s{^=/}{}) { o $dir_name }
elsif (s{^=/}{}) { o $dir_name }
- elsif (s{^([
,;
]?)(?=[ \t])}{}) {
+ elsif (s{^([
~^
]?)(?=[ \t])}{}) {
my $prefix = $pfxmap{$1} // die;
my $after='';
if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
my $prefix = $pfxmap{$1} // die;
my $after='';
if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }