From: Ralf Wildenhues Date: Wed, 5 Oct 2005 14:33:02 +0000 (+0000) Subject: * Makefile.am: Simplify. Do not use abs_top_srcdir. X-Git-Tag: release-2-1b~475 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b2908f836e1c557c7f4c2817fd41cc1b48ad336;p=thirdparty%2Flibtool.git * Makefile.am: Simplify. Do not use abs_top_srcdir. Reported by Gary V. Vaughan . --- diff --git a/ChangeLog b/ChangeLog index 6dabdc81f..55e0f8942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-05 Ralf Wildenhues + + * Makefile.am: Simplify. Do not use abs_top_srcdir. + Reported by Gary V. Vaughan . + 2005-10-05 Gary V. Vaughan * libltdl/m4/ltdl.m4 (_LT_CONFIG_LTDL_DIR): Spurious './' prefixes diff --git a/Makefile.am b/Makefile.am index ca31ebdef..6a14aaa9d 100644 --- 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