From f012a9fdf2d64c27e16181f034bd5fca70b155e5 Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Wed, 9 Sep 1998 11:49:10 +0000 Subject: [PATCH] configure.in (INSTALLDIR): Fix comment about changing INSTALLDIR's value... 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. From-SVN: r22355 --- libstdc++/configure.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libstdc++/configure.in b/libstdc++/configure.in index 09f645fd1707..c47e28c3331c 100644 --- 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 -- 2.43.5