* Makefile.am (lt__cd, CD_TESTDIR): New make macros to work around

problems with CDPATH in some shells.
(check-local, installcheck-local, clean-local): Use them.

diff --git a/ChangeLog b/ChangeLog
index 7f3ab5507425aef17c28ea4a5989f73c1f55e70c..a5ef3489043eb95cd7f7f384b6fa48119cbb9157 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-15  Gary V. Vaughan  <gary@gnu.org>
+
+       * Makefile.am (lt__cd, CD_TESTDIR): New make macros to work around
+       problems with CDPATH in some shells.
+       (check-local, installcheck-local, clean-local): Use them.
+
 2005-04-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>  (tiny change)
 
        * bootstrap: Define srcdir for making `commit'.

diff --git a/Makefile.am b/Makefile.am
index 65c45a4b3b6c2b3ab6115e9ca66306f03ad8fb31..ad68eef7386c7157681768212aa41e7f99592822 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -340,22 +340,22 @@ tests/atconfig: config.status
        $(SHELL) ./config.status tests/atconfig
 DISTCLEANFILES += tests/atconfig
 
+lt__cd         = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+CD_TESTDIR     = abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
+
 # Hook the test suite into the check rule
 check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
-       abs_srcdir=`cd $(srcdir); pwd`; \
-       cd tests; \
+       $(CD_TESTDIR); \
        $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
-       abs_srcdir=`cd $(srcdir); pwd`; \
-       cd tests; \
+       $(CD_TESTDIR); \
        $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
 
 # We need to remove any file droppings left behind by testsuite
 clean-local: clean-local-legacy
-       -abs_srcdir=`cd $(srcdir); pwd`; \
-       cd tests; \
+       -$(CD_TESTDIR); \
        test -f $$abs_srcdir/$(TESTSUITE) && \
            $(SHELL) $$abs_srcdir/$(TESTSUITE) --clean