---- 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
+--- 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, $perllibdir;
- }
-
-@@ -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@';
+- unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++ unshift (@INC, '@datadir@/@PACKAGE@')
+ unless $ENV{AUTOMAKE_UNINSTALLED};
- # 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 @@
+ # 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 @@
BEGIN
{
-- 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};
}
-@@ -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;
+--- 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.