From 00f1b5cef62e4eddd176d5de98ae01ccae5bed9c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Nov 2019 20:55:50 +0000
Subject: [PATCH] WIP

---
 build-aux/subdirmk-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 0c451c8..257479d 100755
--- 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
 }
 
@@ -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);
 
-- 
2.30.2