-@@ -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;
+@@ -522,7 +522,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/lib/Automake/Config.in.orig 2003-12-09 19:20:56.000000000 +0100
++++ automake-1.8/lib/Automake/Config.in 2003-12-13 00:38:45.796795880 +0100
+@@ -31,7 +31,7 @@
+ $APIVERSION = '@APIVERSION@';
+ $PACKAGE = '@PACKAGE@';
+ $VERSION = '@VERSION@';
+-$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++$libdir = '@datadir@/@PACKAGE@';
+
+ 1;;