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 6d0619b21e921efd910806f9887ad653a746c3d7..cf2e1bf0d45a75662845778954f7722adf68f00c 100644 (file)
--- 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 a1886d14f93f7e9ffa6aaecf4ce065827a794f78..26bd0103ef36a7449cd869b29016a23105228a74 100644 (file)
--- 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; \