From a00bd25f6d4345bc66d0c96514c899ba25e2f852 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Nov 2019 21:00:25 +0000
Subject: [PATCH] COMING ALONG

---
 build-aux/subdirmk-setup | 12 +++++++-----
 src/Subdir.mk.in         |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 257479d..8a41d47 100755
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -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 :
@@ -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);
diff --git a/src/Subdir.mk.in b/src/Subdir.mk.in
index 462bd37..4995739 100644
--- a/src/Subdir.mk.in
+++ b/src/Subdir.mk.in
@@ -23,7 +23,7 @@
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ### MA 02111-1307, USA.
 
-&TARGETS_all	+= & toy
+&TARGETS	+= & toy
 
 &OBJECTS	+= & toy.o
 &LIBS		+= lib/libtoy.a
-- 
2.30.2