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