---- automake-1.9.6/doc/automake.texi.orig 2005-07-09 11:28:44.000000000 +0200
-+++ automake-1.9.6/doc/automake.texi 2005-07-16 15:22:23.458288944 +0200
-@@ -32,14 +32,10 @@
- @end quotation
- @end copying
-
+--- automake-1.10/doc/automake.texi.orig 2006-10-15 19:41:24.000000000 +0200
++++ automake-1.10/doc/automake.texi 2006-10-26 23:02:36.354332500 +0200
+@@ -35,15 +35,11 @@
+ @c info Automake points to the Automake package's documentation
+ @c info automake points to the automake script's documentation
+ @c (Autoconf has a similar setup.)
-@dircategory Software development
+@dircategory Programming tools:
@direntry
--* automake: (automake). Making Makefile.in's.
+-* Automake: (automake). Making GNU standards-compliant Makefiles.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4.
-+* automake: (automake). Making Makefile.in's
+-* automake: (automake)Invoking Automake. Generating Makefile.in.
++* Automake: (automake). Making GNU standards-compliant Makefiles
+* aclocal: (automake)aclocal. Generating aclocal.m4
++* automake: (automake)automake. Generating Makefile.in
@end direntry
@titlepage
-@@ -130,7 +126,7 @@
+@@ -94,7 +90,7 @@
+ * Autotools Introduction:: An Introduction to the Autotools
+ * Generalities:: General ideas
+ * Examples:: Some example packages
+-* Invoking Automake:: Creating a Makefile.in
++* automake:: Creating a Makefile.in
+ * configure:: Scanning configure.ac or configure.in
+ * Directories:: Declaring subdirectories
+ * Programs:: Building programs and libraries
+@@ -170,7 +166,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
-@@ -1286,7 +1282,7 @@
+
+ Auto-generating aclocal.m4
+@@ -2297,7 +2293,7 @@
+ (The name of the object files rarely matters.)
+
+
+-@node Invoking Automake
++@node automake
+ @chapter Creating a @file{Makefile.in}
+
+ @cindex Multiple @file{configure.ac} files
+@@ -2520,7 +2516,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
-@@ -1490,13 +1486,12 @@
+ @end menu
+
+@@ -2854,13 +2850,12 @@
@code{m4_include} is seldom used by @file{configure.ac} authors, but
can appear in @file{aclocal.m4} when @command{aclocal} detects that
some required macros come from files local to your package (as opposed
@section Auto-generating aclocal.m4
@cindex Invoking @command{aclocal}
-@@ -2120,12 +2115,12 @@
+@@ -3028,7 +3023,7 @@
+
+ @vindex WARNINGS
+ The environment variable @env{WARNINGS} is honored in the same
+-way as it is for @command{automake} (@pxref{Invoking Automake}).
++way as it is for @command{automake} (@pxref{automake}).
+
+ @end table
+
+@@ -3302,12 +3297,12 @@
@code{ACLOCAL_AMFLAGS} contains options to pass to @command{aclocal}
when @file{aclocal.m4} is to be rebuilt by @command{make}. This line is
@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
+@@ -5128,7 +5123,7 @@
+ passed to the tool invoked by @command{libtool} (hence the use of
+ @samp{@var{library}_LDFLAGS} for libtool linking flags). Generic
+ options include @option{--tag=@var{TAG}} and @option{--silent}
+-(@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The
++(@pxref{libtool, , Invoking @command{libtool}, libtool, The
+ Libtool Manual} for more options) should appear before the mode
+ selection on the command line; in @file{Makefile.am}s they should
+ be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable.
+@@ -8587,7 +8582,7 @@
+ @cindex Option, @option{-W@var{category}}
+ @cindex Option, @option{--warnings=@var{category}}
+ These options behave exactly like their command-line counterpart
+-(@pxref{Invoking Automake}). This allows you to enable or disable some
++(@pxref{automake}). This allows you to enable or disable some
+ warning categories on a per-file basis. You can also setup some warnings
+ for your entire project; for instance, try @samp{AM_INIT_AUTOMAKE([-Wall])}
+ in your @file{configure.ac}.
+@@ -9080,7 +9075,7 @@
+ settings of Automake, or replace some of its rules. Overriding
+ Automake rules is often inadvisable, particularly in the topmost
+ directory of a package with subdirectories. The @option{-Woverride}
+-option (@pxref{Invoking Automake}) comes handy to catch overridden
++option (@pxref{automake}) comes handy to catch overridden
+ definitions.
+
+ Note that Automake does not make any difference between rules with
+@@ -9518,7 +9513,7 @@
+ @end example
+
+ The use of @option{--force-missing} ensures that auxiliary tools will be
+-overridden by new versions (@pxref{Invoking Automake}).
++overridden by new versions (@pxref{automake}).
+
+ It is important to regenerate all these files each time Automake is
+ upgraded, even between bug fixes releases. For instance, it is not
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
# Override SHELL. This is required on DJGPP so that system() uses
---- automake-1.8.4/aclocal.in.orig 2004-04-10 19:15:32.000000000 +0200
-+++ automake-1.8.4/aclocal.in 2004-04-29 02:33:09.191419624 +0200
-@@ -29,7 +29,7 @@
+--- automake-1.10/aclocal.in.orig 2006-10-15 18:19:37.000000000 +0200
++++ automake-1.10/aclocal.in 2006-10-26 23:03:13.812673500 +0200
+@@ -30,7 +30,7 @@
BEGIN
{
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
-@@ -623,7 +623,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.4/lib/Automake/Config.in.orig 2003-12-25 19:00:29.000000000 +0100
-+++ automake-1.8.4/lib/Automake/Config.in 2004-04-29 02:31:08.561758120 +0200
-@@ -32,7 +32,7 @@
- $APIVERSION = '@APIVERSION@';
- $PACKAGE = '@PACKAGE@';
- $VERSION = '@VERSION@';
--$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+$libdir = '@datadir@/@PACKAGE@';
+--- automake-1.10/lib/Automake/Config.in.orig 2005-05-14 21:52:09.000000000 +0200
++++ automake-1.10/lib/Automake/Config.in 2006-10-26 23:07:50.717979000 +0200
+@@ -30,7 +30,7 @@
+ our $APIVERSION = '@APIVERSION@';
+ our $PACKAGE = '@PACKAGE@';
+ our $VERSION = '@VERSION@';
+-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = '@datadir@/@PACKAGE@';
1;;
projects / packages / automake.git / commitdiff