- drop obsolete and outdated manual inclusion of rpm macros

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

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index cb852166abbece9a1b358e5c12da4a8d729971e6..41de1d2716c30f4daa744bd430bfa8449909cdc5 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,42 +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
+--- 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 $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
-   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+-  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++  unshift (@INC, '@datadir@/@PACKAGE@')
+     unless $ENV{AUTOMAKE_UNINSTALLED};
  
    # Override SHELL.  This is required on DJGPP so that system() uses
---- automake-1.8.4/aclocal.in.orig     2004-04-10 19:15:32.000000000 +0200
-+++ automake-1.8.4/aclocal.in  2004-04-29 02:33:09.191419624 +0200
-@@ -29,7 +29,7 @@
+--- 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 @@
  
  BEGIN
  {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
-   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+-  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++  unshift (@INC, '@datadir@/@PACKAGE@')
+     unless $ENV{AUTOMAKE_UNINSTALLED};
  }
  
-@@ -623,7 +623,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
---- automake-1.8.4/lib/Automake/Config.in.orig 2003-12-25 19:00:29.000000000 +0100
-+++ automake-1.8.4/lib/Automake/Config.in      2004-04-29 02:31:08.561758120 +0200
+--- 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 @@
- $APIVERSION = '@APIVERSION@';
- $PACKAGE = '@PACKAGE@';
- $VERSION = '@VERSION@';
--$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+$libdir = '@datadir@/@PACKAGE@';
- 
- 1;;
+ 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@';
  
+ our $perl_threads = 0;
+ # We need at least this version for CLONE support.