configure (enable_version_specific_runtime_libs): Implement new flag…

configure (enable_version_specific_runtime_libs): Implement new flag --enable-version-specific-runtime-libs which installs C++...

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.

From-SVN: r20694

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.

gcc/configure.in

@@ -71,12 +71,9 @@ AC_ARG_WITH(gxx-include-dir,
 [  --with-gxx-include-dir=DIR
                           specifies directory to put g++ header files.],
 gxx_include_dir=$with_gxx_include_dir,
-gxx_include_dir='${prefix}/include/g++')
-
-# Default g++ header file directory if it is empty
-if [[ x$gxx_include_dir = x ]]; then
-	gxx_include_dir='${prefix}/include/g++'
-fi
+if test x${enable_version_specific_runtime_libs} = xyes; then
+gxx_include_dir='${libsubdir}/include/g++'
+else gxx_include_dir='${prefix}/include/g++'; fi)
 
 # Enable expensive internal checks
 AC_ARG_ENABLE(checking,

libio/config/linux.mt

 # Use the libio which comes with the local libc.
 
-# That is where we keep the g++ header files.
-gxx_include_dir =$(prefix)/include/g++
-
 # Comment this out to avoid including the stdio functions in libiostream.a:
 # LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS)
 # LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stdio.list

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 ; \