DEVEL merge

Changed files:
    automake-no_versioned_dir.patch -> 1.3

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index 0b603af90a7cfb10a9adc6610c229d335ffb35ab..d525d80c5506731ccc2307cbf4aaa659b2a55003 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,35 +1,35 @@
---- automake-1.6.2/automake.in~        Sat Jul 27 21:48:15 2002
-+++ automake-1.6.2/automake.in Sat Jul 27 21:48:15 2002
-@@ -32,7 +32,7 @@
+--- 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
+@@ -31,7 +31,7 @@
+ 
  BEGIN
  {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$perllibdir";
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
+   unshift @INC, $perllibdir;
  }
  
-@@ -125,7 +125,7 @@
- my $VERSION = "@VERSION@";
- my $PACKAGE = "@PACKAGE@";
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@";
-+my $libdir = "@datadir@/@PACKAGE@";
+@@ -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@';
+ 
+ # 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
+@@ -29,7 +29,7 @@
  
- # String constants.
- my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
---- automake-1.6.2/aclocal.in~ Sat Jul 27 21:58:48 2002
-+++ automake-1.6.2/aclocal.in  Sat Jul 27 21:58:48 2002
-@@ -30,7 +30,7 @@
  BEGIN
  {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-   unshift @INC, "$perllibdir";
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
+   unshift @INC, $perllibdir;
  }
  
-@@ -218,7 +218,7 @@
+@@ -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.