summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2004-08-02 20:27:16 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2004-08-02 20:27:16 +0000
commit9a92eb377e6e44893647959850985e5fbd867375 (patch)
tree9a7ebfffd5406825890ca83add95f40b98f79548
parent45dc04c9ea181789468c1204f6978bbe7b1ea517 (diff)
downloadautomake-9a92eb377e6e44893647959850985e5fbd867375.tar.gz
* doc/automake.texi (Optional): Update documentation for
AC_CANONICAL_BUILD, AC_CANONICAL_HOST, and AC_CANONICAL_SYSTEM.
-rw-r--r--ChangeLog3
-rw-r--r--doc/automake.texi25
2 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 64176e288..bdb93e287 100644
--- 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 a01c6821b..c886fd1c4 100644
--- 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