- 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 0b603af90a7cfb10a9adc6610c229d335ffb35ab..15c6db07d50d3b1f353b84eca16deeb968a877d8 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,40 +1,33 @@
---- automake-1.6.2/automake.in~        Sat Jul 27 21:48:15 2002
-+++ automake-1.6.2/automake.in Sat Jul 27 21:48:15 2002
-@@ -32,7 +32,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 $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$perllibdir";
- }
+-  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
++  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@')
+     unless @Automake::perl_libdirs;
+   unshift @INC, @Automake::perl_libdirs;
  
-@@ -125,7 +125,7 @@
- my $VERSION = "@VERSION@";
- my $PACKAGE = "@PACKAGE@";
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@";
-+my $libdir = "@datadir@/@PACKAGE@";
+--- 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 @@
  
- # String constants.
- my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
---- automake-1.6.2/aclocal.in~ Sat Jul 27 21:58:48 2002
-+++ automake-1.6.2/aclocal.in  Sat Jul 27 21:58:48 2002
-@@ -30,7 +30,7 @@
  BEGIN
  {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$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@';
  
-@@ -218,7 +218,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
+ our $perl_threads = 0;
+ # We need at least this version for CLONE support.