WIP

diff --git a/Subdir.mk.in b/Subdir.mk.in
index 804880f8b2650f23c6434a0f8ffc2c44504f12d7..722d1dc4588c6cc1048906d45102e2e96ecfb69d 100644 (file)
--- 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 603dab6f6cdbeebd9ed3270ebf99de34d1300f97..e6e30e039912fd36f5703982199d3d7cc7cad736 100755 (executable)
--- 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
 }