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

1 files changed, 11 insertions, 1 deletions

diff --git a/configure b/configure
index fdbaef7575d..57f8c78edc8 100755
--- a/configure
+++ b/configure
@@ -1244,7 +1244,11 @@ EOF
 	    # Note, if you change the default, make sure to fix both here
 	    # and in the gcc subdirectory.
 	    if test -z "${with_gxx_include_dir}"; then
-		echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+	        if test x${enable_version_specific_runtime_libs} = xyes; then
+		    echo gxx_include_dir = '${libsubdir}/include/g++' >> ${Makefile}
+		else
+		    echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+		fi
 	    else
 		echo gxx_include_dir = ${with_gxx_include_dir} >> ${Makefile}
 	    fi
@@ -1255,6 +1259,12 @@ EOF
 	    else
 	        echo enable_shared = ${enable_shared} >> ${Makefile}
 	    fi
+	    # record if we want to rumtime library stuff installed in libsubdir.
+	    if test -z "${enable_version_specific_runtime_libs}"; then
+	        echo enable_version_specific_runtime_libs = no >> ${Makefile}
+	    else
+	        echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile}
+	    fi
 
 	    # Emit a macro which is used to build the libsubdir macro where
 	    # compiler specific stuff can be found/installed.