* doc/automake.texi (Optional): Update documentation for

AC_CANONICAL_BUILD, AC_CANONICAL_HOST, and AC_CANONICAL_SYSTEM.

diff --git a/ChangeLog b/ChangeLog
index 64176e288b9e81b8acdaf29c3ab63c3bfbfd07f6..bdb93e287ae40b70d74d6b66ad5c90d4ca4a8807 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * doc/automake.texi (Optional): Update documentation for
+       AC_CANONICAL_BUILD, AC_CANONICAL_HOST, and AC_CANONICAL_SYSTEM.
+
        * automake.in (AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM): Replace by ...
        (AC_CANONICAL_BUILD, AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM): ... these.
        (scan_autoconf_traces): Scan for the latter three macros instead of

diff --git a/doc/automake.texi b/doc/automake.texi
index a01c6821b9e9e3ec2e3c2c1ec88fb7ec7d30c56b..c886fd1c411d939e0230324f6df09637835d366f 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1342,23 +1342,20 @@ autoconf, The Autoconf Manual}.
 Required files from @code{AC_CONFIG_AUX_DIR} are automatically
 distributed, even if there is no @file{Makefile.am} in this directory.
 
-@item AC_CANONICAL_HOST
+@item AC_CANONICAL_BUILD
+@itemx AC_CANONICAL_HOST
+@itemx AC_CANONICAL_TARGET
 Automake will ensure that @file{config.guess} and @file{config.sub}
-exist.  Also, the @file{Makefile} variables @samp{host_alias} and
-@samp{host_triplet} are introduced.  See @ref{Canonicalizing, ,
-Getting the Canonical System Type, autoconf, The Autoconf Manual}.
+exist.  Also, the @file{Makefile} variables @samp{build_triplet},
+@samp{host_triplet} and @samp{target_triplet} are introduced.  See
+@ref{Canonicalizing, , Getting the Canonical System Type, autoconf,
+The Autoconf Manual}.
+@cvindex AC_CANONICAL_BUILD
 @cvindex AC_CANONICAL_HOST
-@vindex host_alias
+@cvindex AC_CANONICAL_TARGET
+@vindex build_triplet
 @vindex host_triplet
-
-@item AC_CANONICAL_SYSTEM
-This is similar to @code{AC_CANONICAL_HOST}, but also defines the
-@file{Makefile} variables @samp{build_alias} and @samp{target_alias}.
-@xref{Canonicalizing, , Getting the Canonical System Type, autoconf, The
-Autoconf Manual}.
-@cvindex AC_CANONICAL_SYSTEM
-@vindex build_alias
-@vindex target_alias
+@vindex target_triplet
 
 @item AC_LIBSOURCE
 @itemx AC_LIBSOURCES