diff options
author | H.J. Lu <hjl@gnu.org> | 1998-09-02 20:12:35 +0000 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1998-09-02 14:12:35 -0600 |
commit | 7b5070d680bfe6029b9d7f453c995106ef39676d (patch) | |
tree | 55778e8cc2d80e3e6f82d2af2f4b16a019e08731 /libstdc++/Makefile.in | |
parent | 72ae5d03a104c2852acfd21a39737953e6f45070 (diff) | |
download | gcc-7b5070d680bfe6029b9d7f453c995106ef39676d.zip gcc-7b5070d680bfe6029b9d7f453c995106ef39676d.tar.gz gcc-7b5070d680bfe6029b9d7f453c995106ef39676d.tar.bz2 |
Makefile.in (RELINSTALLDIR): New.
* Makefile.in (RELINSTALLDIR): New. Use it to make symlinks.
* configure.in: Fix INSTALLDIR replacement for cross-compile.
From-SVN: r22197
Diffstat (limited to 'libstdc++/Makefile.in')
-rw-r--r-- | libstdc++/Makefile.in | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in index 6736c2c..3696501 100644 --- a/libstdc++/Makefile.in +++ b/libstdc++/Makefile.in @@ -285,21 +285,37 @@ install: INSTALLDIR=$(libsubdir); \ fi; \ INSTALLLINKDIR=$(libsubdir); \ + if [ $${INSTALLLINKDIR}$(MULTISUBDIR) = $${INSTALLDIR} ]; \ + then \ + RELINSTALLDIR=; \ + elif [ x$(MULTISUBDIR) = x ]; then \ + RELINSTALLDIR=../../../; \ + elif [ "x`echo $(MULTISUBDIR) | sed s,[a-z],,g`" = "x/" ]; then \ + RELINSTALLDIR=../../../../; \ + else \ + RELINSTALLDIR=$${INSTALLDIR}/; \ + fi; \ + if [ $(build_alias) != $(target_alias) ]; then \ + case $$RELINSTALLDIR in \ + ../../../|../../../../) \ + RELINSTALLDIR=../$${RELINSTALLDIR}$(target_alias)/lib/;; \ + esac; \ + fi; \ rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$(SHLINK) ; \ rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$(ARLINK) ; \ for FILE in $(LIBS) ; do \ rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ if [ $$FILE = $(SHLINK) ] ; then \ if [ -f $${INSTALLDIR}/$(MSHLINK) ]; then \ - ln -f -s $${INSTALLDIR}/$(MSHLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ + ln -f -s $${RELINSTALLDIR}$(MSHLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ else \ - ln -f -s $${INSTALLDIR}/$(SHLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ + ln -f -s $${RELINSTALLDIR}$(SHLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ fi; \ elif [ $$FILE = $(ARLINK) ] ; then \ if [ -f $${INSTALLDIR}/$(MARLINK) ]; then \ - ln -f -s $${INSTALLDIR}/$(MARLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ + ln -f -s $${RELINSTALLDIR}$(MARLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ else \ - ln -f -s $${INSTALLDIR}/$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ + ln -f -s $${RELINSTALLDIR}$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \ fi; \ elif [ $$FILE = mshlink ]; then \ for FILE in $(MSHLINK) ; do \ |