p

	* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22355 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index 09f645f..c47e28c 100644 (file)
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -103,11 +103,12 @@ LIBC_INTERFACE=${libc_interface}
 
 # post-target:
 
-# If cross-compiling, we install in $(tooldir).
+# If cross-compiling, we install in $(tooldir)/lib or in $(libsubdir)
+# depending on --enable-version-specific-runtime-libs.
 if [ -n "${with_cross_host}" ] ; then
     rm -f Makefile.tem
     sed \
-       -e 's|\(^[      ]*INSTALLDIR[   ]*=[    ]*\)[^  ;]*|\1$(tooldir)/lib|' \
+        -e 's|\(^[     ]*INSTALLDIR[   ]*=[    ]*\)\$(libdir)|\1$(tooldir)/lib|' \
         Makefile >Makefile.tem
     mv -f Makefile.tem Makefile
 fi