Index: Makefile.in
--- Makefile.in.orig	2009-05-17 15:43:45 +0200
+++ Makefile.in	2009-05-28 19:46:09 +0200
@@ -94,7 +94,7 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
+distdir = $(PACKAGE)
 top_distdir = $(distdir)
 am__remove_distdir = \
   { test ! -d "$(distdir)" \
Index: aclocal.in
--- aclocal.in.orig	2009-05-17 15:30:14 +0200
+++ aclocal.in	2009-05-28 19:46:09 +0200
@@ -28,7 +28,7 @@
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 }
 
@@ -57,7 +57,7 @@
 # @system_includes can be augmented with the `dirlist' file.  Also
 # --acdir will reset both @automake_includes and @system_includes.
 my @user_includes = ();
-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
+my @automake_includes = ("@datadir@/aclocal");
 my @system_includes = ('@datadir@/aclocal');
 
 # Whether we should copy M4 file in $user_includes[0].
Index: automake.in
--- automake.in.orig	2009-05-17 15:50:19 +0200
+++ automake.in	2009-05-28 19:46:09 +0200
@@ -31,7 +31,7 @@
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 
   # Override SHELL.  This is required on DJGPP so that system() uses
Index: configure
--- configure.orig	2009-05-17 15:43:44 +0200
+++ configure	2009-05-28 19:46:09 +0200
@@ -2349,7 +2349,7 @@
 
 
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
+pkgvdatadir="\${datadir}/$PACKAGE"
 
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
Index: lib/Automake/Config.in
--- lib/Automake/Config.in.orig	2009-05-17 15:19:29 +0200
+++ lib/Automake/Config.in	2009-05-28 19:46:35 +0200
@@ -28,7 +28,7 @@
 our $APIVERSION = '@APIVERSION@';
 our $PACKAGE = '@PACKAGE@';
 our $VERSION = '@VERSION@';
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+our $libdir = '@datadir@/@PACKAGE@';
 our $perl_threads = @PERL_THREADS@;
 
 1;;
Index: m4/Makefile.in
--- m4/Makefile.in.orig	2009-05-17 15:43:45 +0200
+++ m4/Makefile.in	2009-05-28 19:46:09 +0200
@@ -165,7 +165,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
+m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = \
 $(top_srcdir)/m4/amversion.m4 \
 as.m4 \