From 842f5115b834a1ee3f223dbc12647443e79a34da Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Wed, 9 Sep 1998 11:49:07 +0000 Subject: 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 --- libio/configure.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libio/configure.in b/libio/configure.in index ef19da0..5ffca6c 100644 --- a/libio/configure.in +++ b/libio/configure.in @@ -136,13 +136,12 @@ fi # post-target: -# If cross-compiling, don't build gperf or the utils. They -# will get built by the target compiler, which is confusing. -# We cannot test the installation. 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 -- cgit v1.1