[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fix build-aux/check.mk for non-GNU make.
From: |
Ralf Wildenhues |
Subject: |
[PATCH] Fix build-aux/check.mk for non-GNU make. |
Date: |
Sat, 2 Aug 2008 13:28:33 +0200 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
* build-aux/check.mk ($(TEST_LOGS)) [!GNU_MAKE]: Check for
a $(TESTS) test in the build dir, before one in srcdir.
---
Hmpf. First, this updated patch fixes the alignment of backslash
newline.
Second, I should note that this whole shenanigan only works well because
automake inserts an '$(MAKE) ... $(check_PROGRAMS)' earlier, so that it
is clear that the TESTS entry exists if it has been built, iff it has
been listed in check_PROGRAMS.
I believe this to be no problem for well-written Makefile.am files.
Cheers,
Ralf
build-aux/check.mk | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/build-aux/check.mk b/build-aux/check.mk
index f26696d..4ed55a0 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); \
--
1.5.5.40.g4cdda