- up to 1.10.2

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

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index 0b603af90a7cfb10a9adc6610c229d335ffb35ab..05b785a4582237fdc7993a97d6febb10907a3280 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.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 @@
+ 
  BEGIN
  {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$perllibdir";
- }
- 
-@@ -125,7 +125,7 @@
- my $VERSION = "@VERSION@";
- my $PACKAGE = "@PACKAGE@";
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@";
-+my $libdir = "@datadir@/@PACKAGE@";
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
+   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
  
- # 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
+   # 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 @@
+ 
  BEGIN
  {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$perllibdir";
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
+   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
  }
  
-@@ -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;
+--- 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
+@@ -30,7 +30,7 @@
+ our $APIVERSION = '@APIVERSION@';
+ our $PACKAGE = '@PACKAGE@';
+ our $VERSION = '@VERSION@';
+-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = '@datadir@/@PACKAGE@';
+ 
+ 1;;
  
-     # By default $(datadir)/aclocal doesn't exist.  We don't want to