configure.in (INSTALLDIR): Fix comment about changing INSTALLDIR's value...
M * 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: r22354
This commit is contained in:
parent
842f5115b8
commit
59325b772a
@ -1,3 +1,11 @@
|
||||
1998-09-09 Manfred Hollstein <manfred@s-direktnet.de>
|
||||
|
||||
* Makefile.in (install): Initialize RELINSTALLDIR correctly
|
||||
even for multilib and cross configurations.
|
||||
|
||||
* configure.in (INSTALLDIR): Don't change INSTALLDIR's init
|
||||
value if --enable-version-specific-runtime-libs has been specified.
|
||||
|
||||
Wed Sep 2 21:11:15 1998 H.J. Lu (hjl@gnu.org)
|
||||
|
||||
* Makefile.in (RELINSTALLDIR): New. Use it to make symlinks.
|
||||
|
@ -285,15 +285,20 @@ install:
|
||||
INSTALLDIR=$(libsubdir); \
|
||||
fi; \
|
||||
INSTALLLINKDIR=$(libsubdir); \
|
||||
if [ $${INSTALLLINKDIR}$(MULTISUBDIR) = $${INSTALLDIR} ]; \
|
||||
then \
|
||||
if [ $${INSTALLLINKDIR}$(MULTISUBDIR) = $${INSTALLDIR}$(MULTISUBDIR) ]; then \
|
||||
RELINSTALLDIR=; \
|
||||
elif [ x$(MULTISUBDIR) = x ]; then \
|
||||
RELINSTALLDIR=../../../; \
|
||||
elif [ "x`echo $(MULTISUBDIR) | sed s,[a-z],,g`" = "x/" ]; then \
|
||||
RELINSTALLDIR=../../../../; \
|
||||
if [ $(build_alias) = $(target_alias) ]; then \
|
||||
RELINSTALLDIR=../../../; \
|
||||
else \
|
||||
RELINSTALLDIR=../../../../$(target_alias)/lib/; \
|
||||
fi; \
|
||||
else \
|
||||
RELINSTALLDIR=$${INSTALLDIR}/; \
|
||||
if [ $(build_alias) = $(target_alias) ]; then \
|
||||
RELINSTALLDIR=../../..`echo $(MULTISUBDIR) | sed -e 's,/[^/]*,/..,g'`$(MULTISUBDIR)/; \
|
||||
else \
|
||||
RELINSTALLDIR=../../../..`echo $(MULTISUBDIR) | sed -e 's,/[^/]*,/..,g'`/$(target_alias)/lib$(MULTISUBDIR)/; \
|
||||
fi; \
|
||||
fi; \
|
||||
if [ $(build_alias) != $(target_alias) ]; then \
|
||||
case $$RELINSTALLDIR in \
|
||||
|
Loading…
Reference in New Issue
Block a user