source: scripts/untested/autotools/patches/automake-1.5-slot.patch@ bffaa02

automake-1.5/aclocal.in

@@ -33 +33 @@
 $prefix = "@prefix@";
 # Note that this isn't pkgdatadir, but a separate directory.
-$acdir = "@datadir@/aclocal";
+$acdir = "@datadir@/aclocal-1.5";
 
 # Some globals.
@@ -116 +116 @@
 
 local (@dirlist) = &parse_arguments (@ARGV);
+push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV));
 &scan_m4_files (@dirlist);
 &scan_configure;
@@ -203 +204 @@
     if ($print_and_exit)
     {
-        print $acdir, "\n";
+        print "/usr/share/aclocal", "\n";
         exit 0;
     }

automake-1.5/automake.in

@@ -32 +32 @@
 BEGIN
 {
   my $prefix = "@prefix@";
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-1.5";
   unshift @INC, "$perllibdir";
 }
 
@@ -127 +127 @@
 my $VERSION = "@VERSION@";
 my $PACKAGE = "@PACKAGE@";
 my $prefix = "@prefix@";
-my $libdir = "@datadir@/@PACKAGE@";
+my $libdir = "@datadir@/@PACKAGE@-1.5";
 
 # String constants.
 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';