From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 27 Jul 2012 08:11:48 +0000 (+0200)
Subject: [ng] header vars: remove few old redundant variables
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02461fa1e05201f1acbf811fc793da2eaf27b8d6;p=thirdparty%2Fautomake.git

[ng] header vars: remove few old redundant variables

* lib/am/header-vars.am (target_triplet, host_triplet, build_triplet):
Remove these, redundant because aliases respectively for the variables
$(target), $(host) and $(build).  See also:
<http://lists.gnu.org/archive/html/automake/2012-07/msg00058.html>
* lib/am/dejagnu.am: Adjust.
* NG-NEWS: Update.
* doc/automake-ng.texi: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/NG-NEWS b/NG-NEWS
index 4e9189375..78a65240d 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -274,6 +274,11 @@ Obsolete Features Removed
   renamed to '$(am.remake.aclocal-m4)', and should be considered an
   internal detail.
 
+* The variables $(target_triplet), $(host_triplet) and $(build_triplet),
+  which were redundant because aliases respectively for the variables
+  $(target), $(host) and $(build), have been removed.  Simply use this
+  latter variables.
+
 
 Source Files with Unknown Extensions
 ====================================
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 64a31c216..e8b1303cf 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -2915,14 +2915,13 @@ Currently recognized macros and their effects are:
 @item AC_CANONICAL_BUILD
 @itemx AC_CANONICAL_HOST
 @itemx AC_CANONICAL_TARGET
-@vindex build_triplet
-@vindex host_triplet
-@vindex target_triplet
+@vindex build
+@vindex host
+@vindex target
 Automake will ensure that @file{config.guess} and @file{config.sub}
-exist.  Also, the @file{Makefile} variables @code{build_triplet},
-@code{host_triplet} and @code{target_triplet} are introduced.  See
-@ref{Canonicalizing, , Getting the Canonical System Type, autoconf,
-The Autoconf Manual}.
+exist.  Also, the @file{Makefile} variables @code{build}, @code{host}
+and @code{target} are introduced.  See @ref{Canonicalizing, ,
+Getting the Canonical System Type, autoconf, The Autoconf Manual}.
 
 @item AC_CONFIG_AUX_DIR
 Automake will look for various helper scripts, such as
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index cb8894973..8c8733df7 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -57,11 +57,11 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
 	@echo "set objdir `pwd`" >>site.tmp
 ## Quote the *_alias variables because they might be empty.
 ?BUILD?	@echo 'set build_alias "$(build_alias)"' >>site.tmp
-?BUILD?	@echo 'set build_triplet $(build_triplet)' >>site.tmp
+?BUILD?	@echo 'set build_triplet $(build)' >>site.tmp
 ?HOST?	@echo 'set host_alias "$(host_alias)"' >>site.tmp
-?HOST?	@echo 'set host_triplet $(host_triplet)' >>site.tmp
+?HOST?	@echo 'set host_triplet $(host)' >>site.tmp
 ?TARGET?	@echo 'set target_alias "$(target_alias)"' >>site.tmp
-?TARGET?	@echo 'set target_triplet $(target_triplet)' >>site.tmp
+?TARGET?	@echo 'set target_triplet $(target)' >>site.tmp
 ## Allow the package author to extend site.exp.
 	@list='$(EXTRA_DEJAGNU_SITE_CONFIG)'; for f in $$list; do \
 	  echo "## Begin content included from file $$f.  Do not modify. ##" \
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 52457ea3e..de266d822 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -321,8 +321,3 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-## dejagnu.am uses these variables.  Some users might rely on them too.
-?BUILD?build_triplet = @build@
-?HOST?host_triplet = @host@
-?TARGET?target_triplet = @target@