---- 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.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
+@@ -31,7 +31,7 @@
+
BEGIN
{
- my $prefix = "@prefix@";
-- my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+ my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
- unshift @INC, "$perllibdir";
- }
+- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
+ unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -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.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 @@
- # 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";
+- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
+ unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
-@@ -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;
+@@ -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
+@@ -32,7 +32,7 @@
+ $APIVERSION = '@APIVERSION@';
+ $PACKAGE = '@PACKAGE@';
+ $VERSION = '@VERSION@';
+-$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++$libdir = '@datadir@/@PACKAGE@';
+
+ 1;;
- # By default $(datadir)/aclocal doesn't exist. We don't want to