- 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 614bd188b044f90add1ecf60de28eda5347d5fbf..15c6db07d50d3b1f353b84eca16deeb968a877d8 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,33 +1,33 @@
---- automake-1.8.4/automake.in.orig    2004-04-10 19:15:32.000000000 +0200
-+++ automake-1.8.4/automake.in 2004-04-29 02:33:26.305817840 +0200
-@@ -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 '@PATH_SEPARATOR@', $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.10/aclocal.in.orig      2006-10-15 18:19:37.000000000 +0200
-+++ automake-1.10/aclocal.in   2006-10-26 23:03:13.812673500 +0200
-@@ -30,7 +30,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 '@PATH_SEPARATOR@', $perllibdir);
+-  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
++  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@')
+     unless @Aclocal::perl_libdirs;
+   unshift @INC, @Aclocal::perl_libdirs;
  }
- 
---- automake-1.10/lib/Automake/Config.in.orig  2005-05-14 21:52:09.000000000 +0200
-+++ automake-1.10/lib/Automake/Config.in       2006-10-26 23:07:50.717979000 +0200
-@@ -28,7 +28,7 @@
- our $APIVERSION = '@APIVERSION@';
- our $PACKAGE = '@PACKAGE@';
+--- 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@';
- our $perl_threads = @PERL_THREADS@;
  
- 1;;
+ our $perl_threads = 0;
+ # We need at least this version for CLONE support.