diff options
| author | manfred <manfred@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-06-24 06:26:02 +0000 |
|---|---|---|
| committer | manfred <manfred@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-06-24 06:26:02 +0000 |
| commit | 27588c22e8e78c93e4b4422b19491a9918842ecb (patch) | |
| tree | 1459eff5b36e02bdc264a09e2e7ba103ceab3246 /libstdc++ | |
| parent | da421e40ab04c60bce0449c21bd16d03febfebd5 (diff) | |
| download | gcc-27588c22e8e78c93e4b4422b19491a9918842ecb.tar.gz | |
d
egcs/ChangeLog:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* configure (enable_version_specific_runtime_libs): Implement new flag
--enable-version-specific-runtime-libs which installs C++ runtime stuff in
$(libsubdir); emit definition in each generated Makefile.
(gxx_include_dir): Initialize depending on $enable_version_specific_runtime_libs.
egcs/gcc/ChangeLog:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in (gxx_include_dir): Initialize default value depending on
new flag --enable-version-specific-runtime-libs; remove superfluous default
initialization afterwards.
* configure: Regenerate.
egcs/libio/ChangeLog:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (install): Install _G_config.h depending on new flag
--enable-version-specific-runtime-libs.
* config/linux.mt (gxx_include_dir): Remove definition here as we use
gcc's default anyway.
egcs/libstdc++/ChangeLog:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (INSTALLDIR): Add comment to document the fact,
this macro will be properly initialized at make's runtime.
(install): Add initialization of INSTALLDIR depending on $(libsubdir)
and ${enable_version_specific_runtime_libs}; use $${INSTALLDIR} shell variable
instead of the $(INSTALLDIR) make macro.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20694 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++')
| -rw-r--r-- | libstdc++/Makefile.in | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in index c96ec1bd617..247d8b5105c 100644 --- a/libstdc++/Makefile.in +++ b/libstdc++/Makefile.in @@ -48,6 +48,8 @@ LIBIBERTY_DIR = ../libiberty LIBIBERTY_OBJS = `cat $(LIBIBERTY_DIR)/needed-list` strerror.o tooldir = $(exec_prefix)/$(target) +# This is where the libraries will be installed; note, it will be set +# at make runtime now. See below at target install. INSTALLDIR = $(libdir) MOSTLYCLEAN_JUNK = *stmp-* tlib*.a *.s *.ii stdlist piclist @@ -272,24 +274,29 @@ install: else true ; \ fi rootme=`pwd`/ ; export rootme ; \ - rm -f $(INSTALLDIR)$(MULTISUBDIR)/$(SHLINK) ; \ + if [ x$(libsubdir) = x ] || [ x$(enable_version_specific_runtime_libs) != xyes ]; then \ + INSTALLDIR=$(libdir); \ + else \ + INSTALLDIR=$(libsubdir); \ + fi; \ + rm -f $${INSTALLDIR}$(MULTISUBDIR)/$(SHLINK) ; \ for FILE in $(LIBS) ; do \ - rm -f $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ + rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ if [ $$FILE = $(SHLINK) ] ; then \ - ln -f -s $(SHLIB) $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ + ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ elif [ $$FILE = mshlink ]; then \ for FILE in $(MSHLINK) ; do \ - rm -f $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ - ln -f -s $(SHLIB) $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ + rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ + ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ done; \ elif [ $$FILE = $(SHLIB) ]; then \ - $(INSTALL_PROGRAM) $$FILE $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ + $(INSTALL_PROGRAM) $$FILE $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ : On the HP, shared libraries must be mode 555. ;\ - chmod 555 $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ + chmod 555 $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ else \ - $(INSTALL_DATA) $$FILE $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ - $(RANLIB) $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ - chmod a-x $(INSTALLDIR)$(MULTISUBDIR)/$$FILE ; \ + $(INSTALL_DATA) $$FILE $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ + $(RANLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ + chmod a-x $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \ fi ; \ done @rootme=`pwd`/ ; export rootme ; \ |