-diff -Nru automake-1.4/automake.texi automake-1.4.new/automake.texi
---- automake-1.4/automake.texi Mon Jan 11 05:18:00 1999
-+++ automake-1.4.new/automake.texi Tue Jan 19 00:01:51 1999
-@@ -7,14 +7,10 @@
+--- automake-1.8.2/doc/automake.texi.orig 2004-01-07 20:30:54.000000000 +0100
++++ automake-1.8.2/doc/automake.texi 2004-01-13 20:08:36.370459336 +0100
+@@ -32,14 +32,10 @@
+ @end quotation
+ @end copying
- @include version.texi
-
--@dircategory GNU admin
+-@dircategory Software development
+@dircategory Programming tools:
@direntry
--* automake: (automake). Making Makefile.in's
+-* automake: (automake). Making Makefile.in's.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
--* aclocal: (automake)Invoking aclocal. Generating aclocal.m4
+-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4.
+* automake: (automake). Making Makefile.in's
+* aclocal: (automake)aclocal. Generating aclocal.m4
@end direntry
- @ifinfo
-@@ -909,7 +905,7 @@
+ @titlepage
+@@ -134,7 +130,7 @@
+
+ * Requirements:: Configuration requirements
+ * Optional:: Other things Automake recognizes
+-* Invoking aclocal:: Auto-generating aclocal.m4
++* aclocal:: Auto-generating aclocal.m4
+ * aclocal options:: aclocal command line arguments
+ * Macro search path:: Modifying aclocal's search path
+ * Macros:: Autoconf macros supplied with Automake
+@@ -1230,7 +1226,7 @@
@menu
* Requirements:: Configuration requirements
* Optional:: Other things Automake recognizes
-* Invoking aclocal:: Auto-generating aclocal.m4
+* aclocal:: Auto-generating aclocal.m4
+ * aclocal options:: aclocal command line arguments
+ * Macro search path:: Modifying aclocal's search path
* Macros:: Autoconf macros supplied with Automake
- * Extending aclocal:: Writing your own aclocal macros
- @end menu
-@@ -995,7 +991,7 @@
- @end table
-
+@@ -1449,12 +1445,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}).
--@node Optional, Invoking aclocal, Requirements, configure
-+@node Optional, aclocal, Requirements, configure
- @section Other things Automake recognizes
-
- @cindex Macros Automake recognizes
-@@ -1185,10 +1181,10 @@
@end table
--@node Invoking aclocal, Macros, Optional, configure
-+@node aclocal, Macros, 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
-@@ -1249,7 +1245,7 @@
- @end table
-
-
--@node Macros, Extending aclocal, Invoking aclocal, configure
-+@node Macros, Extending aclocal, aclocal, configure
- @section Autoconf macros supplied with Automake
+ @cindex Invoking aclocal
+@@ -2028,12 +2024,12 @@
- @c consider generating this node automatically from m4 files.
+ @code{ACLOCAL_AMFLAGS} contains options to pass to @command{aclocal}
+ when @file{aclocal.m4} is to be rebuilt by @code{make}. This line is
+-also used by @command{autoreconf} (@pxref{autoreconf Invocation, ,
++also used by @command{autoreconf} (@pxref{autoreconf, ,
+ Using @command{autoreconf} to Update @file{configure} Scripts,
+ autoconf, The Autoconf Manual}) to run @command{aclocal} with suitable
+-options, or by @command{autopoint} (@pxref{autopoint Invocation, ,
++options, or by @command{autopoint} (@pxref{autopoint, ,
+ Invoking the @command{autopoint} Program, gettext, GNU gettext tools})
+-and @command{gettextize} (@pxref{gettextize Invocation, , Invoking the
++and @command{gettextize} (@pxref{gettextize, , Invoking the
+ @command{gettextize} Program, gettext, GNU gettext tools}) to locate
+ the place where Gettext's macros should be installed. So even if you
+ do not really care about the rebuild rules, you should define