summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-08-02 13:22:32 +0200
committerJim Meyering <meyering@redhat.com>2008-08-02 13:57:17 +0200
commit110df929fc42906b2f13729d1cf0b06b4753ce6d (patch)
tree63e60f7dc4e15154ac761b5de79f344b03a64c3b
parente3b5543ea887f41409773d6ed3b884646687a887 (diff)
downloadcoreutils-110df929fc42906b2f13729d1cf0b06b4753ce6d.tar.xz
tests: fix build-aux/check.mk for non-GNU make
* build-aux/check.mk ($(TEST_LOGS)) [!GNU_MAKE]: Check for a $(TESTS) test in the build dir, before one in srcdir. For details, see <http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/14198>.
-rw-r--r--build-aux/check.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/build-aux/check.mk b/build-aux/check.mk
index f26696d4b..92935d9a3 100644
--- a/build-aux/check.mk
+++ b/build-aux/check.mk
@@ -159,8 +159,9 @@ CHECK-FORCE:
DEPENDENCY = CHECK-FORCE
$(TEST_LOGS): $(DEPENDENCY)
@if test '$(DEPENDENCY)' = CHECK-FORCE; then \
- dst=$@; \
- exec $(MAKE) $(AM_MAKEFLAGS) DEPENDENCY='$(srcdir)'/$${dst%.log} $@;\
+ dst=$@; src=$${dst%.log}; \
+ test -x "$$src" || src='$(srcdir)'/$$src; \
+ exec $(MAKE) $(AM_MAKEFLAGS) DEPENDENCY="$$src" $@; \
else \
src='$(DEPENDENCY)'; \
$(am__check_pre) "$$dir$$src" $(am__check_post); \