diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-16 14:50:02 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-16 14:50:02 +0100 |
commit | 1efb88cadad61a031d1c297310bc2634562f2e87 (patch) | |
tree | 84eb7fb42013de443030961e7bf3a740e179d3a2 /automake.in | |
parent | 92bd5d25c2ba94b8664202990d0152e68d440632 (diff) | |
parent | b1e58545f392151970f930be4c89b75b47c087a5 (diff) | |
download | automake-1efb88cadad61a031d1c297310bc2634562f2e87.tar.gz |
Merge branch 'maint'
* maint:
maintcheck: avoid failures, sync with 'ng/master' more
maintcheck: remove 'sc_perl_syntax'
sync: update files from upstream with "make fetch"
maint: get rid of $perllibdir environment variable hack
configure: respect the '-q' option better
cosmetics: de-tabify configure.ac
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 3a401d8ef..3194c9948 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. |