[patch] rename build_canonical, host_canonical to build, host in GCC config

[Nathanael Nerode <neroden at twcny dot rr dot com>]

Mesh with autoconf style by removing useless variable renaming.

I left a remnant in ada/ 'cause I wasn't sure it was safe to reuse the variable.

Tested on i686-pc-linux-gnu, works.

(gcc)
	* Makefile.in, configure.in, config/m68hc11/t-m68hc11-gas:
	Replace "build_canonical" with build, "host_canonical" with host.
	* configure: Regenerate.

(ada)
	* Makefile.in: Replace "host_canonical" with "host" for autoconf
	substitution.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1076
diff -u -r1.1076 Makefile.in
--- Makefile.in	8 Jun 2003 19:35:46 -0000	1.1076
+++ Makefile.in	10 Jun 2003 00:02:34 -0000
@@ -59,8 +59,8 @@
 # Directory where sources are, from where we are.
 VPATH = @srcdir@
 
-build_canonical = @build_canonical@
-host_canonical = @host_canonical@
+build=@build@
+host=@host@
 target=@target@
 target_alias=@target_alias@
 
@@ -273,7 +273,7 @@
   if [ -f $(objdir)/../binutils/ar ] ; then \
     echo $(objdir)/../binutils/ar ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo ar; \
     else \
        t='$(program_transform_cross_name)'; echo ar | sed -e $$t ; \
@@ -286,7 +286,7 @@
   if [ -f $(objdir)/../binutils/ranlib ] ; then \
     echo $(objdir)/../binutils/ranlib ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo $(RANLIB); \
     else \
        t='$(program_transform_cross_name)'; echo ranlib | sed -e $$t ; \
@@ -298,7 +298,7 @@
   elif [ -f $(objdir)/../binutils/nm-new ] ; then \
     echo $(objdir)/../binutils/nm-new ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo nm; \
     else \
        t='$(program_transform_cross_name)'; echo nm | sed -e $$t ; \
@@ -2519,7 +2519,7 @@
 	WARN_CFLAGS="$(WARN_CFLAGS)"; LIBERTY=`pwd`/"$(BUILD_LIBIBERTY)"; \
 	export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS LIBERTY; \
 	cd ./fixinc && \
-	$(SHELL) $${srcdir}/mkfixinc.sh $(build_canonical) $(target))
+	$(SHELL) $${srcdir}/mkfixinc.sh $(build) $(target))
 
 .PHONY: install-gcc-tooldir
 install-gcc-tooldir:
@@ -3246,8 +3246,8 @@
 	@echo "# add them to the last section" >> ./tmp0
 	@echo "set rootme \"`${PWD}`\"" >> ./tmp0
 	@echo "set srcdir \"`cd ${srcdir}; ${PWD}`\"" >> ./tmp0
-	@echo "set host_triplet $(host_canonical)" >> ./tmp0
-	@echo "set build_triplet $(build_canonical)" >> ./tmp0
+	@echo "set host_triplet $(host)" >> ./tmp0
+	@echo "set build_triplet $(build)" >> ./tmp0
 	@echo "set target_triplet $(target)" >> ./tmp0
 	@echo "set target_alias $(target_alias)" >> ./tmp0
 # CFLAGS is set even though it's empty to show we reserve the right to set it.
@@ -3265,7 +3265,7 @@
 # theoretically the -B won't be needed.
 # We also need to pass -L ../ld so that the linker can find ldscripts.
 	@if [ -d $(objdir)/../$(target_subdir)/newlib ] \
-	    && [ "${host_canonical}" != "${target}" ]; then \
+	    && [ "${host}" != "${target}" ]; then \
 	  echo "set newlib_cflags \"-I$(objdir)/../$(target_subdir)/newlib/targ-include -I\$$srcdir/../newlib/libc/include\"" >> ./tmp0; \
 	  echo "set newlib_ldflags \"-B$(objdir)/../$(target_subdir)/newlib/\"" >> ./tmp0; \
 	  echo "append CFLAGS \" \$$newlib_cflags\"" >> ./tmp0; \
Index: config/m68hc11/t-m68hc11-gas
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68hc11/t-m68hc11-gas,v
retrieving revision 1.9
diff -u -r1.9 t-m68hc11-gas
--- config/m68hc11/t-m68hc11-gas	24 Mar 2003 22:26:04 -0000	1.9
+++ config/m68hc11/t-m68hc11-gas	10 Jun 2003 00:02:54 -0000
@@ -2,7 +2,7 @@
   if [ -f $(objdir)/../binutils/ranlib ] ; then \
     echo $(objdir)/../binutils/ranlib ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo ranlib; \
     else \
        if [ -f $(bindir)/$(target_alias)-ranlib ] ; then \
Index: ada/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/Makefile.in,v
retrieving revision 1.42
diff -u -r1.42 Makefile.in
--- ada/Makefile.in	27 Mar 2003 21:51:23 -0000	1.42
+++ ada/Makefile.in	10 Jun 2003 00:08:58 -0000
@@ -179,7 +179,7 @@
 target_alias=@target_alias@
 xmake_file=@dep_host_xmake_file@
 tmake_file=@dep_tmake_file@
-host_canonical=@host_canonical@
+host_canonical=@host@
 #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
 #mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`