mirror of git://gcc.gnu.org/git/gcc.git
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
This commit is contained in:
parent
59325b772a
commit
f012a9fdf2
|
|
@ -103,11 +103,12 @@ LIBC_INTERFACE=${libc_interface}
|
||||||
|
|
||||||
# post-target:
|
# 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
|
if [ -n "${with_cross_host}" ] ; then
|
||||||
rm -f Makefile.tem
|
rm -f Makefile.tem
|
||||||
sed \
|
sed \
|
||||||
-e 's|\(^[ ]*INSTALLDIR[ ]*=[ ]*\)[^ ;]*|\1$(tooldir)/lib|' \
|
-e 's|\(^[ ]*INSTALLDIR[ ]*=[ ]*\)\$(libdir)|\1$(tooldir)/lib|' \
|
||||||
Makefile >Makefile.tem
|
Makefile >Makefile.tem
|
||||||
mv -f Makefile.tem Makefile
|
mv -f Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue