---- automake-1.14/bin/automake.in.orig 2012-11-22 17:36:51.560603115 +0100
-+++ automake-1.14/bin/automake.in 2012-11-22 18:18:52.190550575 +0100
-@@ -29,7 +29,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
{
-- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
-+ @Automake::perl_libdirs = ('@datadir@/@PACKAGE@')
- unless @Automake::perl_libdirs;
- unshift @INC, @Automake::perl_libdirs;
+- unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++ unshift (@INC, '@datadir@/@PACKAGE@')
+ unless $ENV{AUTOMAKE_UNINSTALLED};
---- automake-1.14/bin/aclocal.in.orig 2012-11-22 17:36:51.597269780 +0100
-+++ automake-1.14/bin/aclocal.in 2012-11-22 18:19:11.647216837 +0100
+ # 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
{
-- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
-+ @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@')
- unless @Aclocal::perl_libdirs;
- unshift @INC, @Aclocal::perl_libdirs;
+- unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++ unshift (@INC, '@datadir@/@PACKAGE@')
+ unless $ENV{AUTOMAKE_UNINSTALLED};
}
---- automake-1.14/lib/Automake/Config.in.orig 2013-06-24 17:34:25.598771336 +0200
-+++ automake-1.14/lib/Automake/Config.in 2013-06-24 17:35:31.062101922 +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 @@
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
our $RELEASE_YEAR = '@RELEASE_YEAR@';
--our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+our $libdir = '@datadir@/@PACKAGE@';
+-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.