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';