- revert debian python detection hacks that cause misdetection in PLD

[packages/automake.git] / automake-no_versioned_dir.patch

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index 0ce16bf00d2eacbaed7bf9b5c7b93c02b947dd28..15c6db07d50d3b1f353b84eca16deeb968a877d8 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,42 +1,33 @@
---- automake-1.8/automake.in.orig      2003-12-08 18:53:57.000000000 +0100
-+++ automake-1.8/automake.in   2003-12-12 23:59:37.118849200 +0100
-@@ -31,7 +31,7 @@
+--- automake-1.14/bin/automake.in.orig 2012-11-22 17:36:51.560603115 +0100
++++ automake-1.14/bin/automake.in      2012-11-22 18:18:52.190550575 +0100
+@@ -29,7 +29,7 @@
  
  BEGIN
  {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
-   unshift @INC, (split ':', $perllibdir);
+-  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
++  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@')
+     unless @Automake::perl_libdirs;
+   unshift @INC, @Automake::perl_libdirs;
  
-   # Override SHELL.  This is required on DJGPP so that system() uses
---- automake-1.8/aclocal.in.orig       2003-12-05 22:19:39.000000000 +0100
-+++ automake-1.8/aclocal.in    2003-12-13 00:01:06.689232432 +0100
-@@ -29,7 +29,7 @@
+--- automake-1.14/bin/aclocal.in.orig  2012-11-22 17:36:51.597269780 +0100
++++ automake-1.14/bin/aclocal.in       2012-11-22 18:19:11.647216837 +0100
+@@ -27,7 +27,7 @@
  
  BEGIN
  {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
-   unshift @INC, (split ':', $perllibdir);
+-  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
++  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@')
+     unless @Aclocal::perl_libdirs;
+   unshift @INC, @Aclocal::perl_libdirs;
  }
+--- automake-1.14/lib/Automake/Config.in.orig  2013-06-24 17:34:25.598771336 +0200
++++ automake-1.14/lib/Automake/Config.in       2013-06-24 17:35:31.062101922 +0200
+@@ -32,7 +32,7 @@
+ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
+ our $VERSION = '@VERSION@';
+ our $RELEASE_YEAR = '@RELEASE_YEAR@';
+-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = '@datadir@/@PACKAGE@';
  
-@@ -522,7 +522,7 @@
-   # Search the versioned directory near the end, and then the
-   # unversioned directory last.  Only do this if the user didn't
-   # override acdir.
--  push (@dirlist, "$acdir-$APIVERSION")
-+  push (@dirlist, "$acdir")
-     if $acdir eq $default_acdir;
- 
-   # By default $(datadir)/aclocal doesn't exist.  We don't want to
---- automake-1.8/lib/Automake/Config.in.orig   2003-12-09 19:20:56.000000000 +0100
-+++ automake-1.8/lib/Automake/Config.in        2003-12-13 00:38:45.796795880 +0100
-@@ -31,7 +31,7 @@
- $APIVERSION = '@APIVERSION@';
- $PACKAGE = '@PACKAGE@';
- $VERSION = '@VERSION@';
--$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+$libdir = '@datadir@/@PACKAGE@';
- 
- 1;;
- 
+ our $perl_threads = 0;
+ # We need at least this version for CLONE support.