* Makefile.am: Simplify. Do not use abs_top_srcdir.

Reported by Gary V. Vaughan <gary@gnu.org>.

diff --git a/ChangeLog b/ChangeLog
index 6dabdc81f8213f8abb8af569e84978374be4424e..55e0f89422e0bc855aa4aece54c89fd201d464e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am: Simplify.  Do not use abs_top_srcdir.
+       Reported by Gary V. Vaughan <gary@gnu.org>.
+
 2005-10-05  Gary V. Vaughan  <gary@gnu.org>
 
        * libltdl/m4/ltdl.m4 (_LT_CONFIG_LTDL_DIR): Spurious './' prefixes

diff --git a/Makefile.am b/Makefile.am
index ca31ebdef1ff4e25e3cd9061a027ef1d44e71b0b..6a14aaa9dda94c6de6a56b66afee4f6198983907 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -492,9 +492,6 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
        FC="$(FC)" FCFLAGS="$(FCFLAGS)" \
        GCJ="$(GCJ)" GCJFLAGS="$(GCJFLAGS)"
 
-BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)"
-INSTALLCHECK_ENVIRONMENT =
-
 check-recursive: $(srcdir)/$(TESTSUITE)
 
 # Use `$(srcdir)' for the benefit of non-GNU makes: this is
@@ -523,12 +520,12 @@ CD_TESTDIR        = abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
 # Hook the test suite into the check rule
 check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
        $(CD_TESTDIR); \
-       $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
+       $(TESTS_ENVIRONMENT) _lt_pkgdatadir="$$abs_srcdir" $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
        $(CD_TESTDIR); \
-       $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
+       $(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