Revert "build: Improvement for self -rR make kludge (2)"
This reverts commit 62664f8436ab3f717fd2b5d1d52c20e6f4f38ca8.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 60110c76..48ee69ce 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,8 +1,14 @@
# Nuke built-in rules and variables.
-ifeq ($(__BASH_MAKE_COMPLETION__)$(GMAKE_BUILTINS),)
+ROOTMAKE := true
+ifeq ($(__BASH_MAKE_COMPLETION__)$(ROOTMAKE),true)
+ifeq ($(MAKECMDGOALS),)
+ override TARGETS := all
+else
+ override TARGETS := $(MAKECMDGOALS)
+endif
override TMP_INC := $(shell mktemp)
-$(shell for t in DEFAULT $(MAKECMDGOALS); do printf ".PHONY: $$t\n$$t:\n\t@true\n" >>'$(TMP_INC)'; done)
-$(shell printf "\t@rm -f '\$$(TMP_INC)'\n\t@\$$(MAKE) -rR \$$(MAKECMDGOALS) GMAKE_BUILTINS=off\n" >>'$(TMP_INC)')
+$(shell for t in $(TARGETS); do printf ".PHONY: $$t\n$$t:\n\t@true\n" >>'$(TMP_INC)'; done)
+$(shell printf "\t@rm -f '\$$(TMP_INC)'\n\t@\$$(MAKE) -rR \$$(MAKECMDGOALS) ROOTMAKE=false\n" >>'$(TMP_INC)')
include $(TMP_INC)
else
