From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Nov 2019 01:21:51 +0000 (+0000)
Subject: subdirmk: Fix bug when target in subdir exists
X-Git-Tag: v0.6.0~275
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=26f3a8e48e0116b59d5056e25dc31e46af4ef0aa

subdirmk: Fix bug when target in subdir exists

If you try to make a file that exists, the % rule doesn't seem to
match.  But providing the dependency for all of $(MAKCMDGOALS)
works.

We have to mention `all' explicitly because it might not appear in
$(MAKECMDGOALS).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/subdirmk/generate b/subdirmk/generate
index f46747d..1787546 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -99,7 +99,7 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-%:	FORCE-ALWAYS-RUN
+\$(MAKECMDGOALS) all: FORCE-ALWAYS-RUN
 	\@:
 Makefile FORCE-ALWAYS-RUN:
 	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))