* 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.
Signed-off-by: Stefano Lattarini <[email protected]> --- NG-NEWS | 5 +++++ lib/am/dejagnu.am | 6 +++--- lib/am/header-vars.am | 5 ----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NG-NEWS b/NG-NEWS index 4e91893..78a6524 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/lib/am/dejagnu.am b/lib/am/dejagnu.am index cb88949..8c8733d 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 52457ea..de266d8 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@ -- 1.7.12.rc0
