- merged update for 1.8 from DEVEL

Changed files:
    automake-info.patch -> 1.10
    automake-no_versioned_dir.patch -> 1.4

diff --git a/automake-info.patch b/automake-info.patch
index 52b39fde89e2dee8802cccebda3152b68a091157..d3c4fe7606f1de9c4c472e31ac8e97a684269a70 100644 (file)
--- a/automake-info.patch
+++ b/automake-info.patch
@@ -1,9 +1,8 @@
-diff -Nru automake-1.7.5b.orig/automake.texi automake-1.7.5b/automake.texi
---- automake-1.7.5b.orig/automake.texi 2003-07-05 00:03:41.000000000 +0200
-+++ automake-1.7.5b/automake.texi      2003-07-05 11:03:40.000000000 +0200
-@@ -7,14 +7,10 @@
- 
- @include version.texi
+--- automake-1.8/doc/automake.texi.orig        2003-12-09 19:11:18.000000000 +0100
++++ automake-1.8/doc/automake.texi     2003-12-12 23:57:21.535461008 +0100
+@@ -33,14 +33,10 @@
+ @end quotation
+ @end copying
  
 -@dircategory Software development
 +@dircategory Programming tools:
@@ -18,8 +17,8 @@ diff -Nru automake-1.7.5b.orig/automake.texi automake-1.7.5b/automake.texi
 +* aclocal: (automake)aclocal.         Generating aclocal.m4.
  @end direntry
  
- @ifinfo
-@@ -1107,7 +1103,7 @@
+ @titlepage
+@@ -1095,7 +1091,7 @@
  @menu
  * Requirements::                Configuration requirements
  * Optional::                    Other things Automake recognizes
@@ -28,34 +27,18 @@ diff -Nru automake-1.7.5b.orig/automake.texi automake-1.7.5b/automake.texi
  * aclocal options::             aclocal command line arguments
  * Macro search path::           Modifying aclocal's search path
  * Macros::                      Autoconf macros supplied with Automake
-@@ -1145,7 +1141,7 @@
- @end table
- 
- 
--@node Optional, Invoking aclocal, Requirements, configure
-+@node Optional, aclocal, Requirements, configure
- @section Other things Automake recognizes
+@@ -1314,12 +1310,12 @@
+ can appear in @file{aclocal.m4} when @command{aclocal} detects that
+ some required macros come from files local to your package (as
+ opposed to macros installed in a system-wide directory, see
+-@ref{Invoking aclocal}).
++@ref{aclocal}).
  
- @cindex Macros Automake recognizes
-@@ -1305,10 +1301,10 @@
  @end table
  
  
--@node Invoking aclocal, aclocal options, Optional, configure
-+@node aclocal, aclocal options, Optional, configure
+-@node Invoking aclocal
++@node aclocal
  @section Auto-generating aclocal.m4
  
--@cindex Invoking aclocal
-+@cindex aclocal
- @cindex aclocal, Invoking
- 
- Automake includes a number of Autoconf macros which can be used in your
-@@ -1344,7 +1340,7 @@
- * Macro search path::           How aclocal finds .m4 files
- @end menu
- 
--@node aclocal options, Macro search path, Invoking aclocal, configure
-+@node aclocal options, Macro search path, aclocal, configure
- @section aclocal options
- 
- @cindex aclocal, Options
+ @cindex Invoking aclocal

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index d525d80c5506731ccc2307cbf4aaa659b2a55003..0ce16bf00d2eacbaed7bf9b5c7b93c02b947dd28 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,40 +1,42 @@
---- 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
+--- automake-1.8/automake.in.orig      2003-12-08 18:53:57.000000000 +0100
++++ automake-1.8/automake.in   2003-12-12 23:59:37.118849200 +0100
 @@ -31,7 +31,7 @@
  
  BEGIN
  {
 -  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
 +  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
-   unshift @INC, $perllibdir;
- }
- 
-@@ -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@';
+   unshift @INC, (split ':', $perllibdir);
  
- # 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
+   # Override SHELL.  This is required on DJGPP so that system() uses
+--- automake-1.8/aclocal.in.orig       2003-12-05 22:19:39.000000000 +0100
++++ automake-1.8/aclocal.in    2003-12-13 00:01:06.689232432 +0100
 @@ -29,7 +29,7 @@
  
  BEGIN
  {
 -  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
 +  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
-   unshift @INC, $perllibdir;
+   unshift @INC, (split ':', $perllibdir);
  }
  
-@@ -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;;
  
-     # By default $(datadir)/aclocal doesn't exist.  We don't want to