diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-16 12:45:59 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-16 12:45:59 +0100 |
| commit | 4872dfe765470157af6276f7e9bd8c5d3f0e34eb (patch) | |
| tree | c18962b814ffe229405c6a8c18331b9237803b4f /automake.in | |
| parent | e0a0fbf00414e26bf9869c2d82177fd9426887b2 (diff) | |
| download | automake-4872dfe765470157af6276f7e9bd8c5d3f0e34eb.tar.gz | |
maint: get rid of $perllibdir environment variable hack
That was needed when the automake-$APIVERSION and aclocal-$APIVERSION
wrapper scripts used by the testsuite were shell script, rather than
perl scripts acting as a thin layers.
* aclocal.in (BEGIN): Update @INC based on the contents of the array
'@Aclocal::perl_libdirs', rather than of the environment variable
'perllibdir'.
* t/wrap/aclocal.in (BEGIN): Initialize '@Aclocal::perl_libdirs'
rather than $ENV{'perllibdir'}.
* automake.in (BEGIN): Update @INC based on the contents of the array
'@Automake::perl_libdirs', rather than of the environment variable
'perllibdir'.
* t/wrap/automake.in (BEGIN): Initialize '@Automake::perl_libdirs'
rather than $ENV{'perllibdir'}.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'automake.in')
| -rw-r--r-- | automake.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/automake.in b/automake.in index 4c5ed2cc0..11c670a4e 100644 --- a/automake.in +++ b/automake.in @@ -29,8 +29,9 @@ package Language; BEGIN { - my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); + @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') + unless @Automake::perl_libdirs; + unshift @INC, @Automake::perl_libdirs; # Override SHELL. This is required on DJGPP so that system() uses # bash, not COMMAND.COM which doesn't quote arguments properly. |