summaryrefslogtreecommitdiff
path: root/bin
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 /bin
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 'bin')
-rw-r--r--bin/aclocal.in5
-rw-r--r--bin/automake.in5
-rw-r--r--bin/wrap-aclocal.in3
-rw-r--r--bin/wrap-automake.in3
4 files changed, 4 insertions, 12 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';