- 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 614bd188b044f90add1ecf60de28eda5347d5fbf..41de1d2716c30f4daa744bd430bfa8449909cdc5 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,33 +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.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 @@
+--- 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};
  }
  
---- 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
-@@ -28,7 +28,7 @@
- our $APIVERSION = '@APIVERSION@';
- our $PACKAGE = '@PACKAGE@';
+--- 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 $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+our $libdir = '@datadir@/@PACKAGE@';
- our $perl_threads = @PERL_THREADS@;
+ our $RELEASE_YEAR = '@RELEASE_YEAR@';
+-our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@';
  
- 1;;
+ our $perl_threads = 0;
+ # We need at least this version for CLONE support.