- updated to 1.16.5

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

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index 0b603af90a7cfb10a9adc6610c229d335ffb35ab..41de1d2716c30f4daa744bd430bfa8449909cdc5 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.16/bin/automake.in.orig 2018-03-03 08:01:09.987847780 +0100
++++ automake-1.16/bin/automake.in      2018-03-03 08:03:07.704513100 +0100
+@@ -31,7 +31,7 @@
+ 
  BEGIN
  {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$perllibdir";
- }
+-  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++  unshift (@INC, '@datadir@/@PACKAGE@')
+     unless $ENV{AUTOMAKE_UNINSTALLED};
  
-@@ -125,7 +125,7 @@
- my $VERSION = "@VERSION@";
- my $PACKAGE = "@PACKAGE@";
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@";
-+my $libdir = "@datadir@/@PACKAGE@";
+   # Override SHELL.  This is required on DJGPP so that system() uses
+--- automake-1.16/bin/aclocal.in.orig  2018-03-03 08:01:09.991181113 +0100
++++ automake-1.16/bin/aclocal.in       2018-03-03 08:04:06.407845767 +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";
+-  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++  unshift (@INC, '@datadir@/@PACKAGE@')
+     unless $ENV{AUTOMAKE_UNINSTALLED};
  }
  
-@@ -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.16/lib/Automake/Config.in.orig  2018-03-03 08:01:09.991181113 +0100
++++ automake-1.16/lib/Automake/Config.in       2018-03-03 08:04:36.151178758 +0100
+@@ -32,7 +32,7 @@
+ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
+ our $VERSION = '@VERSION@';
+ our $RELEASE_YEAR = '@RELEASE_YEAR@';
+-our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@';
  
-     # 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.