summaryrefslogtreecommitdiff
path: root/libstdc++
diff options
context:
space:
mode:
authormanfred <manfred@138bc75d-0d04-0410-961f-82ee72b054a4>1998-09-09 11:49:10 +0000
committermanfred <manfred@138bc75d-0d04-0410-961f-82ee72b054a4>1998-09-09 11:49:10 +0000
commit29d20c366863c4c8f0337f0aeeb0c602a2a719f3 (patch)
tree6c28eaa55d20f7576ea1aebf5874c5660955a1be /libstdc++
parentd8a88b703ad57d6d9ceac16d80db9c425d32d878 (diff)
downloadgcc-29d20c366863c4c8f0337f0aeeb0c602a2a719f3.tar.gz
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
Diffstat (limited to 'libstdc++')
-rw-r--r--libstdc++/configure.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index 09f645fd170..c47e28c3331 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