OSDN Git Service

#
authormanfred <manfred@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 24 Jun 1998 06:25:58 +0000 (06:25 +0000)
committermanfred <manfred@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 24 Jun 1998 06:25:58 +0000 (06:25 +0000)
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@20692 138bc75d-0d04-0410-961f-82ee72b054a4

libio/Makefile.in

index ed597cc..75a1d00 100644 (file)
@@ -107,8 +107,13 @@ install:
        rootme=`pwd`/ ; export rootme ; \
        if [ -z "$(MULTISUBDIR)" ]; then \
          if [ "$(_G_CONFIG_H)" != "" ]; then \
-           rm -f $(tooldir)/include/_G_config.h ; \
-           $(INSTALL_DATA) _G_config.h $(tooldir)/include/_G_config.h || exit 1; \
+           if [ x$(enable_version_specific_runtime_libs) = xyes ]; then \
+             rm -f $(gxx_include_dir)/include/_G_config.h ; \
+             $(INSTALL_DATA) _G_config.h $(gxx_include_dir)/include/_G_config.h || exit 1; \
+           else \
+             rm -f $(tooldir)/include/_G_config.h ; \
+             $(INSTALL_DATA) _G_config.h $(tooldir)/include/_G_config.h || exit 1; \
+           fi; \
          else true; \
          fi ; \
          cd $(srcdir); \