--- Makefile.in.orig	Tue Apr 27 19:33:36 2004
+++ Makefile.in	Tue Apr 27 19:34:52 2004
@@ -134,7 +134,7 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgvdatadir = @pkgvdatadir@
+pkgvdatadir = $(pkgvdatadir)
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
@@ -592,13 +592,6 @@
 
 install-exec-hook:
 	@$(POST_INSTALL)
-	@for p in $(bin_SCRIPTS); do \
-	  f="`echo $$p|sed '$(transform)'`"; \
-	  fv="$$f-$(APIVERSION)"; \
-	  rm -f $(DESTDIR)$(bindir)/$$fv; \
-	  echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
-	  $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
-	done
 
 uninstall-hook:
 	@for p in $(bin_SCRIPTS); do \

--- aclocal.in.orig	Sat Apr 10 10:15:32 2004
+++ aclocal.in	Tue Apr 27 19:32:46 2004
@@ -29,7 +29,7 @@
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@address@hidden@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 }
 

--- automake.in.orig	Tue Apr 27 19:33:06 2004
+++ automake.in	Tue Apr 27 19:33:24 2004
@@ -31,7 +31,7 @@
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@address@hidden@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 
   # Override SHELL.  This is required on DJGPP so that system() uses

--- lib/Automake/Makefile.in.orig	Tue Apr 27 19:36:11 2004
+++ lib/Automake/Makefile.in	Tue Apr 27 19:36:49 2004
@@ -122,7 +122,7 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgvdatadir = @pkgvdatadir@
+pkgvdatadir = $(pkgdatadir)
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@

--- lib/Makefile.in.orig	Tue Apr 27 19:35:02 2004
+++ lib/Makefile.in	Tue Apr 27 19:35:51 2004
@@ -125,7 +125,7 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgvdatadir = @pkgvdatadir@
+pkgvdatadir = $(pkgdatadir)
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
--- lib/am/Makefile.in.orig	Tue Apr 27 19:37:10 2004
+++ lib/am/Makefile.in	Tue Apr 27 19:37:40 2004
@@ -112,7 +112,7 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgvdatadir = @pkgvdatadir@
+pkgvdatadir = $(pkgdatadir)
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@

--- m4/Makefile.in.orig	Tue Apr 27 19:37:51 2004
+++ m4/Makefile.in	Tue Apr 27 19:38:34 2004
@@ -112,14 +112,14 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgvdatadir = @pkgvdatadir@
+pkgvdatadir = $(pkgdatadir)
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
+m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = \
 $(top_srcdir)/m4/amversion.m4 \
 as.m4 \