Commit 842f5115 by Manfred Hollstein

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

 
	* 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: r22353
parent bdc82ef1
...@@ -136,13 +136,12 @@ fi ...@@ -136,13 +136,12 @@ fi
# post-target: # post-target:
# If cross-compiling, don't build gperf or the utils. They # If cross-compiling, we install in $(tooldir)/lib or in $(libsubdir)
# will get built by the target compiler, which is confusing. # depending on --enable-version-specific-runtime-libs.
# We cannot test the installation. We install in $(tooldir).
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment