From afbc2533af32a58f0ef2582902e83648128bebdb Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 Nov 2019 02:15:08 +0000
Subject: [PATCH] WIP

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

diff --git a/Subdir.mk.in b/Subdir.mk.in
index 804880f..722d1dc 100644
--- a/Subdir.mk.in
+++ b/Subdir.mk.in
@@ -16,7 +16,7 @@ LIBS		?= @LIBS@
 
 INCLUDES	+= -I&^/lib/
 
-LINK		?= $(LD) -o$@ $(CFLAGS) $(LDFLAGS)
+LINK		?= $(CC) -o$@ $(CFLAGS) $(LDFLAGS)
 AR		?= ar
 COMPILE		?= $(CC) -c -o$@ -MD $(DEFS) $(INCLUDES) $(CFLAGS)
 
diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 603dab6..e6e30e0 100755
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -79,10 +79,11 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
+	\@: \$@
 %:	FORCE-ALWAYS-RUN
 	\$(MAKE) -C $cd -f subdirs.mk ${dir_prefix}\$@
 Makefile FORCE-ALWAYS-RUN:
-	: \$@
+	\@: \$@
 .SUFFIXES:
 END
 }
-- 
2.30.2