Makefile.in ($(ARLINK), $(SHLINK)): Don't rely on 'ln -f'.

        * Makefile.in ($(ARLINK), $(SHLINK)): Don't rely on 'ln -f'.
        * Makefile.in (install): Don't rely on 'ln -f'.

From-SVN: r22456

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index a90f59e32be33f9daa33ee348d2e5f067e2c52ff..abb7890b5aad6c489abb27fc64418fcea5a3dad7 100644 (file)
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 17 01:29:46 1998  H.J. Lu  (hjl@gnu.org)
+
+       * Makefile.in ($(ARLINK), $(SHLINK)): Don't rely on 'ln -f'.
+
+       * Makefile.in (install): Don't rely on 'ln -f'.
+
 1998-09-09  Manfred Hollstein  <manfred@s-direktnet.de>
 
        * Makefile.in (install): Initialize RELINSTALLDIR correctly

diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in
index 84e9a45f4a1d3417e786a930d65e8c860d0036a0..3bdb2d5e7cb3a2c3df0d5b02cbfe5a2bbbd1bec3 100644 (file)
--- a/libstdc++/Makefile.in
+++ b/libstdc++/Makefile.in
@@ -89,7 +89,8 @@ $(ARLIB): stdlist
        $(RANLIB) $(ARLIB)
 
 $(ARLINK):
-       ln -f -s $(ARLIB) $(ARLINK)
+       -rm -f $(ARLINK)
+       ln -s $(ARLIB) $(ARLINK)
 
 marlink:
        @$(MAKE) $(MARLINK) "ARLINK=$(MARLINK)"
@@ -104,7 +105,8 @@ $(SHARLIB): $(SHLIB)
        $(RANLIB) $(SHARLIB)
 
 $(SHLINK):
-       ln -f -s $(SHLIB) $(SHLINK)
+       -rm -f $(SHLINK)
+       ln -s $(SHLIB) $(SHLINK)
 
 mshlink:
        @$(MAKE) $(MSHLINK) "SHLINK=$(MSHLINK)"
@@ -312,25 +314,29 @@ install:
          rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
          if [ $$FILE = $(SHLINK) ] ; then \
            if [ -f $${INSTALLDIR}/$(MSHLINK) ]; then \
-             ln -f -s $${RELINSTALLDIR}$(MSHLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             ln -s $${RELINSTALLDIR}$(MSHLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
            else \
-             ln -f -s $${RELINSTALLDIR}$(SHLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             ln -s $${RELINSTALLDIR}$(SHLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
            fi; \
          elif [ $$FILE = $(ARLINK) ] ; then \
            if [ -f $${INSTALLDIR}/$(MARLINK) ]; then \
-             ln -f -s $${RELINSTALLDIR}$(MARLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             ln -s $${RELINSTALLDIR}$(MARLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
            else \
-             ln -f -s $${RELINSTALLDIR}$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+             ln -s $${RELINSTALLDIR}$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
            fi; \
          elif [ $$FILE = mshlink ]; then \
            for FILE in $(MSHLINK) ; do \
              rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
-             ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+             ln -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
            done; \
          elif [ $$FILE = marlink ]; then \
            for FILE in $(MARLINK) ; do \
              rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
-             ln -f -s $(ARLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+             ln -s $(ARLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
            done; \
          elif [ $$FILE = $(SHLIB) ]; then \
            $(INSTALL_PROGRAM) $$FILE $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \