gcc:

	* config.gcc, config/m68hc11/t-m68hc11-gas: Replace uses of
	target_alias with target_noncanonical.

ada:
	* Make-lang.in: Replace uses of $(target_alias) with
	$(target_noncanonical).
	* ada/Makefile.in: Remove unused mention of $(target_alias).

cp:
	* Make-lang.in: Replace uses of $(target_alias) with
	$(target_noncanonical).

java:
	* Make-lang.in: Replace uses of $(target_alias) with
	$(target_noncanonical).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72487 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 73 insertions, 53 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ee700c449d..efae1131a21 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* config.gcc, config/m68hc11/t-m68hc11-gas: Replace uses of
+	target_alias with target_noncanonical.
+
 2003-10-14  Geoffrey Keating  <geoffk@apple.com>
 
 	* expr.c (block_move_libcall_safe_for_call_parm): Clean up,
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 746ab8acceb..eb1257d2bf6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Make-lang.in: Replace uses of $(target_alias) with
+	$(target_noncanonical).
+	* ada/Makefile.in: Remove unused mention of $(target_alias).
+
 2003-10-06  Mark Mitchell  <mark@codesourcery.com>
 
 	* Make-lang.in (ada.info): Replace with ...
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 955eda6c0f8..ea9f1f1a73b 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -464,7 +464,7 @@ dvi:: ada/gnat_ug_vms.dvi ada/gnat_ug_wnt.dvi \
 
 ada.install-normal:
 
-# Install the binder program as $(target_alias)-gnatbind
+# Install the binder program as $(target_noncanonical)-gnatbind
 # and also as either gnatbind (if native) or $(tooldir)/bin/gnatbind
 # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat,
 # gnatprep, gnatbl, gnatls, gnatxref, gnatfind
@@ -474,8 +474,8 @@ ada.install-common:
 	 then \
 	  if [ -f gnatbind-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext); \
-	    $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbind$(exeext); \
+	    $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbind$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	      rm -f $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \
 	      $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \
@@ -489,8 +489,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatbl-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext); \
-	    $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbl$(exeext); \
+	    $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbl$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \
 	       $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \
@@ -504,8 +504,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatchop-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext); \
-	    $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatchop$(exeext); \
+	    $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatchop$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \
 	       $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \
@@ -519,8 +519,8 @@ ada.install-common:
 	then \
 	  if [ -f gnat-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext); \
-	    $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnat$(exeext); \
+	    $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnat$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \
 	       $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \
@@ -534,8 +534,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatkr-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr$(exeext); \
-	    $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatkr$(exeext); \
+	    $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatkr$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \
 	       $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \
@@ -549,8 +549,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatlink-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext); \
-	    $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatlink$(exeext); \
+	    $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatlink$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \
 	       $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \
@@ -564,8 +564,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatls-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext); \
-	    $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatls$(exeext); \
+	    $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatls$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \
 	       $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \
@@ -579,8 +579,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatmake-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext); \
-	    $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatmake$(exeext); \
+	    $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatmake$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \
 	       $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \
@@ -594,8 +594,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatmem-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext); \
-	    $(INSTALL_PROGRAM) gnatmem-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatmem$(exeext); \
+	    $(INSTALL_PROGRAM) gnatmem-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatmem$(exeext); \
 	  else \
 	    $(RM) $(DESTDIR)$(bindir)/gnatmem$(exeext); \
 	    $(INSTALL_PROGRAM) gnatmem$(exeext) $(DESTDIR)$(bindir)/gnatmem$(exeext); \
@@ -605,8 +605,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatname-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext); \
-	    $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \
+	    $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \
 	  else \
 	    $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \
 	    $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \
@@ -616,8 +616,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatprep-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext); \
-	    $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatprep$(exeext); \
+	    $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatprep$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \
 	       $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \
@@ -631,8 +631,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatpsta-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext); \
-	    $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatpsta$(exeext); \
+	    $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatpsta$(exeext); \
 	    if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
 	       rm -f $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \
 	       $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \
@@ -646,8 +646,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatxref-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext); \
-	    $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \
+	    $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \
 	  else \
 	    $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \
 	    $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \
@@ -657,8 +657,8 @@ ada.install-common:
 	then \
 	  if [ -f gnatfind-cross$(exeext) ] ; \
 	  then \
-	    $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext); \
-	    $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext); \
+	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \
+	    $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \
 	  else \
 	    $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \
 	    $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \
@@ -717,22 +717,22 @@ ada.uninstall:
 	-$(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext)
 	-$(RM) $(DESTDIR)$(bindir)/gnatpsta$(exeext)
 	-$(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatdll$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlbr$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext)
-	-$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbind$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbl$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatchop$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnat$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatdll$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatkr(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatlbr$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatlink$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatls$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatmake$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatmem$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatprep$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatpsta$(exeext)
+	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext)
 	-$(RM) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext)
 	-$(RM) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext)
 	-$(RM) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext)
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index abed86b7cde..b96584367db 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -176,7 +176,6 @@ program_transform_name =
 objdir = .
 
 target=@target@
-target_alias=@target_alias@
 xmake_file = @xmake_file@
 tmake_file = @tmake_file@
 host_canonical=@host@
diff --git a/gcc/config.gcc b/gcc/config.gcc
index b1662945667..52bbe9215d2 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2192,7 +2192,7 @@ if test x$with_cpu = x ; then
       with_cpu=i486
       ;;
     i586-*-*)
-      case $target_alias in
+      case ${target_noncanonical} in
         k6_2-*)
           with_cpu=k6-2
           ;;
@@ -2211,7 +2211,7 @@ if test x$with_cpu = x ; then
       esac
       ;;
     i686-*-* | i786-*-*)
-      case $target_alias in
+      case ${target_noncanonical} in
         k8-*)
           with_cpu=k8
           ;;
diff --git a/gcc/config/m68hc11/t-m68hc11-gas b/gcc/config/m68hc11/t-m68hc11-gas
index d53ae4043c8..8bbbf3c450d 100644
--- a/gcc/config/m68hc11/t-m68hc11-gas
+++ b/gcc/config/m68hc11/t-m68hc11-gas
@@ -5,8 +5,8 @@ RANLIB_FOR_TARGET = ` \
     if [ "$(host)" = "$(target)" ] ; then \
       echo ranlib; \
     else \
-       if [ -f $(bindir)/$(target_alias)-ranlib ] ; then \
-	  echo $(bindir)/$(target_alias)-ranlib ; \
+       if [ -f $(bindir)/$(target_noncanonical)-ranlib ] ; then \
+	  echo $(bindir)/$(target_noncanonical)-ranlib ; \
        else \
           t='$(program_transform_cross_name)'; echo ranlib | sed -e $$t ; \
        fi; \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dd25ea37ad8..a5817e4bff3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Make-lang.in: Replace uses of $(target_alias) with
+	$(target_noncanonical).
+
 2003-10-13  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* ChangeLog: Add PR number to patch for PR c++/12370.
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 52a5a0c916a..7f37a843a0d 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -39,8 +39,8 @@
 # Actual names to use when installing a native compiler.
 CXX_INSTALL_NAME = `echo c++|sed '$(program_transform_name)'`
 GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'`
-CXX_TARGET_INSTALL_NAME = $(target_alias)-`echo c++|sed '$(program_transform_name)'`
-GXX_TARGET_INSTALL_NAME = $(target_alias)-`echo g++|sed '$(program_transform_name)'`
+CXX_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo c++|sed '$(program_transform_name)'`
+GXX_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo g++|sed '$(program_transform_name)'`
 
 # Actual names to use when installing a cross-compiler.
 CXX_CROSS_NAME = `echo c++|sed '$(program_transform_cross_name)'`
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3c0af4eab2f..e27ea02996b 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Make-lang.in: Replace uses of $(target_alias) with
+	$(target_noncanonical).
+
 2003-10-09  Tom Tromey  <tromey@redhat.com>
 
 	* decl.c (java_init_decl_processing): Declare signers field.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index aa785521155..8e430bda831 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -42,7 +42,7 @@
 
 # Actual names to use when installing a native compiler.
 JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'`
-JAVA_TARGET_INSTALL_NAME = $(target_alias)-`echo gcj|sed '$(program_transform_name)'`
+JAVA_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcj|sed '$(program_transform_name)'`
 
 # Actual names to use when installing a cross-compiler.
 JAVA_CROSS_NAME = `echo gcj|sed '$(program_transform_cross_name)'`