From: Manfred Hollstein <manfred@s-direktnet.de>
Date: Wed, 9 Sep 1998 11:49:09 +0000 (+0000)
Subject: configure.in (INSTALLDIR): Fix comment about changing INSTALLDIR's value...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59325b772a83ca7d833c3d340796ffb2b04a1055;p=gcc.git

configure.in (INSTALLDIR): Fix comment about changing INSTALLDIR's value...

M
	* libio/configure.in (INSTALLDIR): Fix comment about changing INSTALLDIR's
	value; don't change its value if --enable-version-specific-runtime-libs
	has been specified.
	* libstdc++/Makefile.in (install): Initialize RELINSTALLDIR correctly
	even for multilib and cross configurations.
	* libstdc++/configure.in (INSTALLDIR): Don't change INSTALLDIR's init
	value if --enable-version-specific-runtime-libs has been specified.

From-SVN: r22354
---

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index c430be55569..a90f59e32be 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,11 @@
+1998-09-09  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (install): Initialize RELINSTALLDIR correctly
+	even for multilib and cross configurations.
+
+	* configure.in (INSTALLDIR): Don't change INSTALLDIR's init
+	value if --enable-version-specific-runtime-libs has been specified.
+
 Wed Sep  2 21:11:15 1998  H.J. Lu  (hjl@gnu.org)
 
 	* Makefile.in (RELINSTALLDIR): New. Use it to make symlinks.
diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in
index 3696501b9d6..84e9a45f4a1 100644
--- a/libstdc++/Makefile.in
+++ b/libstdc++/Makefile.in
@@ -285,15 +285,20 @@ install:
 	  INSTALLDIR=$(libsubdir); \
 	fi; \
 	INSTALLLINKDIR=$(libsubdir); \
-	if [ $${INSTALLLINKDIR}$(MULTISUBDIR) = $${INSTALLDIR} ]; \
-	then \
+	if [ $${INSTALLLINKDIR}$(MULTISUBDIR) = $${INSTALLDIR}$(MULTISUBDIR) ]; then \
 	  RELINSTALLDIR=; \
 	elif [ x$(MULTISUBDIR) = x ]; then \
-	  RELINSTALLDIR=../../../; \
-	elif [ "x`echo $(MULTISUBDIR) | sed s,[a-z],,g`" = "x/" ]; then \
-	  RELINSTALLDIR=../../../../; \
+	  if [ $(build_alias) = $(target_alias) ]; then \
+	    RELINSTALLDIR=../../../; \
+	  else \
+	    RELINSTALLDIR=../../../../$(target_alias)/lib/; \
+	  fi; \
 	else \
-	  RELINSTALLDIR=$${INSTALLDIR}/; \
+	  if [ $(build_alias) = $(target_alias) ]; then \
+	    RELINSTALLDIR=../../..`echo $(MULTISUBDIR) | sed -e 's,/[^/]*,/..,g'`$(MULTISUBDIR)/; \
+	  else \
+	    RELINSTALLDIR=../../../..`echo $(MULTISUBDIR) | sed -e 's,/[^/]*,/..,g'`/$(target_alias)/lib$(MULTISUBDIR)/; \
+	  fi; \
 	fi; \
 	if [ $(build_alias) != $(target_alias) ]; then \
 	  case $$RELINSTALLDIR in \