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.

(cherry picked from commit 93ee6b8a22d1decf67db3a4a9434f51fd384d62c)

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 14a05756ee05c9f94448a0c5b10c53f1228f36d3..6bf3bd1d84a60be39aa36000a364ff04ec13f5ce 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -40,7 +40,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 bb9de5b86978bf6dba0bb3a938c17a0bf01a94fb..6768294652e703406413df62e0cd433ede405237 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -86,7 +86,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; \