diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-08-29 13:23:24 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-08-29 17:18:19 +0200 |
| commit | 37d403fd06596cd27ffd22d5d9796af811841305 (patch) | |
| tree | 7fe296c234c046efaa1cd1f884ec22c5c9f994ab | |
| parent | 361f25da9cdfa390bcfde88f31c71e7403bb2f3b (diff) | |
| download | automake-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.
| -rw-r--r-- | bin/aclocal.in | 5 | ||||
| -rw-r--r-- | bin/automake.in | 5 | ||||
| -rw-r--r-- | bin/wrap-aclocal.in | 3 | ||||
| -rw-r--r-- | bin/wrap-automake.in | 3 | ||||
| -rw-r--r-- | t/Makefile.inc | 6 |
5 files changed, 7 insertions, 15 deletions
diff --git a/bin/aclocal.in b/bin/aclocal.in index 7350c8e38..abd352376 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -27,9 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') - unless @Aclocal::perl_libdirs; - unshift @INC, @Aclocal::perl_libdirs; + unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@') + unless $ENV{AUTOMAKE_UNINSTALLED}; } use strict; diff --git a/bin/automake.in b/bin/automake.in index cdea38856..ad86cf4a8 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -31,9 +31,8 @@ use strict; BEGIN { - @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') - unless @Automake::perl_libdirs; - unshift @INC, @Automake::perl_libdirs; + unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@') + unless $ENV{AUTOMAKE_UNINSTALLED}; # Override SHELL. This is required on DJGPP so that system() uses # bash, not COMMAND.COM which doesn't quote arguments properly. diff --git a/bin/wrap-aclocal.in b/bin/wrap-aclocal.in index a624bcb16..2fcccb4a2 100644 --- a/bin/wrap-aclocal.in +++ b/bin/wrap-aclocal.in @@ -19,9 +19,6 @@ BEGIN { use strict; - @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib'); - unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib' - if '@srcdir@' ne '.'; unshift @ARGV, '--automake-acdir=@abs_top_srcdir@/m4', '--system-acdir=@abs_top_srcdir@/m4/acdir'; diff --git a/bin/wrap-automake.in b/bin/wrap-automake.in index 1075346a1..a363dbc7c 100644 --- a/bin/wrap-automake.in +++ b/bin/wrap-automake.in @@ -19,9 +19,6 @@ BEGIN { use strict; - @Automake::perl_libdirs = ('@abs_top_srcdir@/lib'); - unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib' - if '@srcdir@' ne '.'; unshift @ARGV, '--libdir=@abs_top_srcdir@/lib'; } require '@abs_top_builddir@/bin/automake'; 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 |