From: Evan Hunt <each@isc.org>
Date: Fri, 6 Apr 2018 10:09:50 +0000 (+0200)
Subject: Alter distclean rule to prevent recursing into the same directory twice
X-Git-Tag: v9.13.0~64^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ee6b8a22d1decf67db3a4a9434f51fd384d62c;p=thirdparty%2Fbind9.git

Alter distclean rule to prevent recursing into the same directory twice

Commit f87e0c03ee removed the "system" directory from the TESTDIRS
variable in bin/tests/Makefile.in in an attempt to fix "make distclean"
which was broken since commit 0d784de16a.  However, this change
prevented any system tests from being run when "make test" is invoked.

We now put it back into both SUBDIRS and TESTDIRS, but with a modified
rule to check for the existence of a Makefile in each subdirectory before
trying to run make there. This prevents "make distclean" from trying to
run again in a directory where it's already been run.
---

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 6d0619b21e9..cf2e1bf0d45 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -33,7 +33,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 LIBS =		@LIBS@
 
 SUBDIRS =	system @PKCS11_TOOLS@
-TESTDIRS =
+TESTDIRS =	system
 
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
diff --git a/make/rules.in b/make/rules.in
index a1886d14f93..26bd0103ef3 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -81,7 +81,7 @@ install:: all
 
 install uninstall clean distclean maintainer-clean doc docclean man manclean::
 	@for i in ${ALL_SUBDIRS} ${ALL_TESTDIRS}; do \
-		if [ "$$i" != "nulldir" -a -d $$i ]; then \
+		if [ "$$i" != "nulldir" -a -d $$i -a -f $$i/Makefile ]; then \
 			echo "making $@ in `pwd`/$$i"; \
 			(cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \
 		fi; \