COMING ALONG

[subdirmk.git] / build-aux / subdirmk-setup

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 0c451c84acf23cfd978f5492f87e4ae7f458ceef..8a41d47195088b585a524e547c656b1abd3749b6 100755 (executable)
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -78,7 +78,7 @@ sub write_makefile ($$) {
     o <<END;
 default: all
 %:
-       \$(MAKE) -C $cd ${dir_prefix}$@
+       \$(MAKE) -C $cd ${dir_prefix}\$@
 END
 }
 
@@ -103,20 +103,20 @@ sub filter_subdir_mk ($$$$$) {
            if ($2) { o $esclit; next; }
            s{^$esc}{} or die "$_ ?";
            if (s{^$esc}{}) { o "$esclit$esclit" }
-           elsif (s{^TARGETS(?:_[0-9a-zA-Z_]+)?(?=\W)}{}) {
-               my $t = $2 // 'all';
+           elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
+               my $t = $1 // 'all';
                o target_varname($var_prefix, $t);
                $targets->{$t}=1;
            }
-           elsif (m{^(?=$caps_re)}) { o "${var_prefix}_" }
+           elsif (m{^(?=$caps_re)}) { o $var_prefix }
            elsif (m{^(?=$lc_re)}) { o $dir_prefix }
-           elsif (s{^_}{}) { o "${var_prefix}_" }
+           elsif (s{^_}{}) { o $var_prefix }
            elsif (s{^/}{}) { o $dir_prefix }
            elsif (s{^=_}{}) { o $var_prefix }
            elsif (s{^=/}{}) { o $dir_name }
            elsif (s{^\^}{}) { o "\$(top_srcdir)${dir_suffix}" }
            elsif (s{^\}}{}) { o "\$(abs_top_srcdir)${dir_suffix}" }
-           elsif (s{^(?:[ \t]+([~^]))?(?=[ \t]){}}{}) {
+           elsif (s{^(?:[ \t]+([~^]))?(?=[ \t])}{}) {
                my $prefix =
                    !$1       ? $dir_prefix                     :
                    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :
@@ -153,7 +153,7 @@ sub process_subtree ($$) {
     my $dir_prefix = join '', map { "$_/" } @$path;
     my $dir_suffix = join '', map { "/$_" } @$path;
     my $dir_name = join '/', @$path ? @$path : '.';
-    my $var_prefix = map { "${_}_" } @$path ? @$path : qw(TOP);
+    my $var_prefix = join '', map { "${_}_" } @$path ? @$path : qw(TOP);
 
     write_makefile($dir_prefix, scalar @$path);
 
@@ -170,6 +170,8 @@ sub process_subtree ($$) {
     filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
                     $var_prefix, \%targets);
 
+    o "\n";
+
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
        my $target_varname = target_varname($var_prefix, $target);