summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2017-08-29 13:23:24 +0200
committerMathieu Lirzin <mthl@gnu.org>2017-08-29 17:18:19 +0200
commit37d403fd06596cd27ffd22d5d9796af811841305 (patch)
tree7fe296c234c046efaa1cd1f884ec22c5c9f994ab /t
parent361f25da9cdfa390bcfde88f31c71e7403bb2f3b (diff)
downloadautomake-37d403fd06596cd27ffd22d5d9796af811841305.tar.gz
build: Use PERL5LIB from 'pre-inst-env' script
* bin/aclocal.in: Detect build environment with AUTOMAKE_UNINSTALLED. Let 'PERL5LIB' from 'pre-inst-env' define the perl module directories. * bin/automake.in: Likewise. * bin/wrap-aclocal.in: Don't set 'Automake::perl_libdirs' anymore. * bin/wrap-automake.in: Likewise. * t/Makefile.inc (LOG_COMPILER, PL_LOG_COMPILER): Use 'pre-inst-env'. (AM_PL_LOG_FLAGS): Don't set perl module path.
Diffstat (limited to 't')
-rw-r--r--t/Makefile.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/Makefile.inc b/t/Makefile.inc
index 936108ed6..6b3b62fed 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -20,13 +20,13 @@
## ------------ ##
# Run the tests with a proper shell detected at configure time.
-LOG_COMPILER = $(AM_TEST_RUNNER_SHELL)
+LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL)
TEST_EXTENSIONS = .pl .sh .tap
SH_LOG_COMPILER = $(LOG_COMPILER)
TAP_LOG_COMPILER = $(LOG_COMPILER)
-PL_LOG_COMPILER = $(PERL)
-AM_PL_LOG_FLAGS = -Mstrict -I $(builddir)/lib -I $(srcdir)/lib -w
+PL_LOG_COMPILER = ./pre-inst-env $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -w
TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh