aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Rupp <drupp@cs.washington.edu>1995-02-21 18:38:37 -0500
committerRichard Kenner <kenner@gcc.gnu.org>1995-02-21 18:38:37 -0500
commitbe81d4d77ca94740e3743cb23f0f9674eb26438b (patch)
treef0bdca5556aa676142a5864e9a861aa943fcf738
parent1f12ca9d5bfc8a55b3c2a53349f08dd66522a3ab (diff)
downloadgcc-be81d4d77ca94740e3743cb23f0f9674eb26438b.zip
gcc-be81d4d77ca94740e3743cb23f0f9674eb26438b.tar.gz
gcc-be81d4d77ca94740e3743cb23f0f9674eb26438b.tar.bz2
Modify "ln" commands to try a "cp" if "ln" fails.
($exeext, $objext, $oldobjext): New macros. From-SVN: r9006
-rw-r--r--gcc/cp/Make-lang.in40
1 files changed, 22 insertions, 18 deletions
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index d8bf23b..75bd8da 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -1,5 +1,5 @@
# Top level makefile fragment for GNU C++.
-# Copyright (C) 1994 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995 Free Software Foundation, Inc.
#This file is part of GNU CC.
@@ -100,26 +100,30 @@ c++.install-normal:
# Install the driver program as $(target)-g++
# and also as either g++ (if native) or $(tooldir)/bin/g++.
c++.install-common:
- -if [ -f cc1plus ] ; then \
- if [ -f g++-cross ] ; then \
- rm -f $(bindir)/$(GXX_CROSS_NAME); \
- $(INSTALL_PROGRAM) g++-cross $(bindir)/$(GXX_CROSS_NAME); \
- chmod a+x $(bindir)/$(GXX_CROSS_NAME); \
- rm -f $(bindir)/$(CXX_CROSS_NAME); \
- ln $(bindir)/$(GXX_CROSS_NAME) $(bindir)/$(CXX_CROSS_NAME); \
+ -if [ -f cc1plus$(exeext) ] ; then \
+ if [ -f g++-cross$(exeext) ] ; then \
+ rm -f $(bindir)/$(GXX_CROSS_NAME)$(exeext); \
+ $(INSTALL_PROGRAM) g++-cross$(exeext) $(bindir)/$(GXX_CROSS_NAME)$(exeext); \
+ chmod a+x $(bindir)/$(GXX_CROSS_NAME)$(exeext); \
+ rm -f $(bindir)/$(CXX_CROSS_NAME)$(exeext); \
+ ln $(bindir)/$(GXX_CROSS_NAME)$(exeext) $(bindir)/$(CXX_CROSS_NAME)$(exeext) \
+ > /dev/null 2>&1 \
+ || cp $(bindir)/$(GXX_CROSS_NAME)$(exeext) $(bindir)/$(CXX_CROSS_NAME)$(exeext) ; \
else \
- rm -f $(bindir)/$(GXX_INSTALL_NAME); \
- $(INSTALL_PROGRAM) g++ $(bindir)/$(GXX_INSTALL_NAME); \
- chmod a+x $(bindir)/$(GXX_INSTALL_NAME); \
- rm -f $(bindir)/$(CXX_INSTALL_NAME); \
- ln $(bindir)/$(GXX_INSTALL_NAME) $(bindir)/$(CXX_INSTALL_NAME); \
+ rm -f $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
+ $(INSTALL_PROGRAM) g++$(exeext) $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
+ chmod a+x $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
+ rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
+ ln $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) \
+ > /dev/null 2>&1 \
+ || cp $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) ; \
fi ; \
fi
c++.install-info:
c++.install-man: $(srcdir)/cp/g++.1
- -if [ -f cc1plus ] ; then \
+ -if [ -f cc1plus$(exeext) ] ; then \
if [ -f g++-cross ] ; then \
rm -f $(mandir)/$(GXX_CROSS_NAME)$(manext); \
$(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_CROSS_NAME)$(manext); \
@@ -132,10 +136,10 @@ c++.install-man: $(srcdir)/cp/g++.1
else true; fi
c++.uninstall:
- -rm -rf $(bindir)/$(CXX_INSTALL_NAME)
- -rm -rf $(bindir)/$(CXX_CROSS_NAME)
- -rm -rf $(bindir)/$(GXX_INSTALL_NAME)
- -rm -rf $(bindir)/$(GXX_CROSS_NAME)
+ -rm -rf $(bindir)/$(CXX_INSTALL_NAME)$(exeext)
+ -rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext)
+ -rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext)
+ -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext)
-rm -rf $(mandir)/$(GXX_INSTALL_NAME)$(manext)
-rm -rf $(mandir)/$(GXX_CROSS_NAME)$(manext)