- 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 d525d80c5506731ccc2307cbf4aaa659b2a55003..15c6db07d50d3b1f353b84eca16deeb968a877d8 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,40 +1,33 @@
---- automake-1.7/automake.in.wiget     Wed Sep 25 19:54:22 2002
-+++ automake-1.7/automake.in   Thu Sep 26 09:42:12 2002
-@@ -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, $perllibdir;
- }
+-  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
++  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@')
+     unless @Automake::perl_libdirs;
+   unshift @INC, @Automake::perl_libdirs;
  
-@@ -126,7 +126,7 @@
- # VERSION as string so that eg version 0.30 will print correctly.
- my $VERSION = '@VERSION@';
- my $PACKAGE = '@PACKAGE@';
--my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+my $libdir = '@datadir@/@PACKAGE@';
- 
- # Some regular expressions.  One reason to put them here is that it
- # makes indentation work better in Emacs.
---- automake-1.7/aclocal.in.wiget      Thu Sep 19 22:34:47 2002
-+++ automake-1.7/aclocal.in    Thu Sep 26 09:43:59 2002
-@@ -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, $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@';
  
-@@ -185,7 +185,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.