Make-lang.in (GFORTRAN_TARGET_INSTALL_NAME): Define.

	* Make-lang.in (GFORTRAN_TARGET_INSTALL_NAME): Define.
	(GFORTRAN_CROSS_NAME): Remove.
	(fortran.install-common): Correctly install a cross compiler.
	(fortran.uninstall): Use GFORTRAN_TARGET_INSTALL_NAME instead of
	GFORTRAN_CROSS_NAME.

From-SVN: r106256

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8b1560c6eedd3ea818b70eb12fb212a1c461919e..d3757933f96ecf0d888e2f764b75ea6ea5c02a84 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-31  Andreas Schwab  <schwab@suse.de>
+
+       * Make-lang.in (GFORTRAN_TARGET_INSTALL_NAME): Define.
+       (GFORTRAN_CROSS_NAME): Remove.
+       (fortran.install-common): Correctly install a cross compiler.
+       (fortran.uninstall): Use GFORTRAN_TARGET_INSTALL_NAME instead of
+       GFORTRAN_CROSS_NAME.
+
 2005-10-30  Erik Edelmann  <eedelman@gcc.gnu.org>
 
        * gfortran.texi: Update contributors.

diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 485033e93aae8fd275864079583f33c101c51492..96b6e2521103732e4d49a6f6661f96e201c9f8a4 100644 (file)
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -42,9 +42,7 @@
 
 # Actual name to use when installing a native compiler.
 GFORTRAN_INSTALL_NAME := $(shell echo gfortran|sed '$(program_transform_name)')
-
-# Actual name to use when installing a cross-compiler.
-GFORTRAN_CROSS_NAME := $(shell echo gfortran|sed '$(program_transform_cross_name)')
+GFORTRAN_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gfortran|sed '$(program_transform_name)')
 
 #^L
 
@@ -189,18 +187,15 @@ fortran.install-normal:
 # and also as either gfortran (if native) or $(tooldir)/bin/gfortran.
 fortran.install-common: installdirs
        -if [ -f f951$(exeext) ] ; then \
+         rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) gfortran$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
+         chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
          if [ -f gfortran-cross$(exeext) ] ; then \
-           rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) gfortran-cross$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
            if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
              rm -f $(DESTDIR)$(gcc_tooldir)/bin/gfortran$(exeext); \
              $(INSTALL_PROGRAM) gfortran-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gfortran$(exeext); \
            else true; fi; \
          else \
-           rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) gfortran$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
            rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \
            $(LN) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \
          fi ; \
@@ -223,7 +218,7 @@ fortran.uninstall:
        else : ; fi; \
        rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
        rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \
-       rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
+       rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \
        rm -rf $(DESTDIR)$(infodir)/gfortran.info*
 
 #\f