upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-24 07:41:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Alter distclean rule to prevent recursing into the same directory twice

Browse source 
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.
This commit is contained in:
Evan Hunt 2018-04-06 12:09:50 +02:00
parent 80ab2c0f22
commit 93ee6b8a22
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/Makefile.in
View file

@ -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

2
make/rules.in
View file

@ -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; \