From 4800c931218887da8996d827a9351335e1e7e5f1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Nov 2019 13:04:43 +0000
Subject: [PATCH] run config.status with selective tags

---
 .gitignore           |  1 +
 subdirmk/regen.mk.in | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 60b28ff..7951b38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /configure
 
 ## subdirmk-generated
+.makefiles.stamp
 /main.mk
 /subdirmk/regen.mk
 Makefile
diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 2661ee1..e2944f0 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -14,20 +14,17 @@ $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 
 MAKEFILES += subdirmk/regen.mk
 
-main.mk $(MAKEFILES): .config.status.needed
-	./$<
-.INTERMEDIATE: .config.status.needed
-.config.status.needed: 						\
+main.mk $(MAKEFILES): .makefiles.stamp ;
+.makefiles.stamp: 						\
 		$(top_srcdir)/subdirmk/generate			\
 		$(CONFIG_STATUS)				\
 		$(top_srcdir)/Perdir.mk.in			\
 		$(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
-	: $?
-	set -e; printf >$@.tmp "#!/bin/sh\nset -e\n%s %s"	\
-		"./$(CONFIG_STATUS)"				\
-		"$(if	$(filter-out %.mk.in, $?),,		\
-			$(patsubst %.mk.in,%.mk,$?))"	;	\
-		chmod +x $@.tmp; mv -f $@.tmp $@
+	: $? X $(filter-out Subdir.mk.in regen.mk.in, $(notdir $?))
+	./$(CONFIG_STATUS) $(if					\
+		$(filter-out Subdir.mk.in regen.mk.in, $(notdir $?)),,	\
+		$(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?)))
+	touch $@
 
 realclean:: clean
 	$(RM) config.status config.log
-- 
2.30.2