Makefile.in (CPP_CROSS_NAME): New variable.

        * Makefile.in (CPP_CROSS_NAME): New variable.
        (install-cpp): Use it instead of CPP_INSTALL_NAME for the cross
        xcpp.
        (uninstall-cpp): Use CPP_INSTALL_NAME and CPP_CROSS_NAME for the
        names of the files to be uninstalled.

From-SVN: r30177

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a66ccb0e99bff5b06ab5d2da06e8c676a1372ea..03ba90be1259e886e646cc006c3bdd8f329bd7f2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 25 23:10:45 1999  Andreas Schwab  <schwab@suse.de>
+
+       * Makefile.in (CPP_CROSS_NAME): New variable.
+       (install-cpp): Use it instead of CPP_INSTALL_NAME for the cross
+       xcpp.
+       (uninstall-cpp): Use CPP_INSTALL_NAME and CPP_CROSS_NAME for the
+       names of the files to be uninstalled.
+
 Mon Oct 25 23:03:09 1999  Jeffrey A Law  (law@cygnus.com)
 
        * haifa-sched.c (add_dependence): Update the true dependency

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1ca5e95cdbd1754c89885fb50e618f93aed21004..6b9194595227b11aef9c600294fe11e5caa4d929 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -469,6 +469,7 @@ GCOV_INSTALL_NAME = `t='$(program_transform_name)'; echo gcov | sed -e $$t`
 
 # Actual name to use when installing a cross-compiler.
 GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
+CPP_CROSS_NAME = `t='$(program_transform_cross_name)'; echo cpp | sed -e $$t`
 PROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo protoize | sed -e $$t`
 UNPROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo unprotoize | sed -e $$t`
 
@@ -2448,17 +2449,28 @@ install-cross-rest: install-float-h-cross
 
 # Handle cpp installation.
 install-cpp: xcpp$(exeext)
-       -rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
-       $(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
-       if [ x$(cpp_install_dir) != x ]; then \
-         rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
-         $(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
-       else true; fi
+       -if [ -f gcc-cross$(exeext) ] ; then \
+         rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(bindir)/$(CPP_CROSS_NAME)$(exeext); \
+         if [ x$(cpp_install_dir) != x ]; then \
+           rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
+           $(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
+         else true; fi; \
+       else \
+         rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(bindir)/$(CPP_INSTALL_NAME)$(exeext); \
+         if [ x$(cpp_install_dir) != x ]; then \
+           rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
+           $(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
+         else true; fi; \
+       fi
 
 uninstall-cpp:
-       -rm -f $(bindir)/cpp
+       -rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
+       -rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext)
        -if [ x$(cpp_install_dir) != x ]; then \
-         rm -f $(prefix)/$(cpp_install_dir)/cpp; \
+         rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
+         rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
        else true; fi
 
 # Install float.h for cross compiler.