acinclude.m4 (glibcpp_toolexeclibdir): Make multilib safe.

2001-06-26  Zoltan Hidvegi  <hzoli@austin.ibm.com>

	* acinclude.m4 (glibcpp_toolexeclibdir): Make multilib safe.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r43599

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 18b3b5d22d023a065ed5975d2ea526b91bea82c1..19bed9a51ab7357f79359ae6cc90553073390b2e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-26  Zoltan Hidvegi  <hzoli@austin.ibm.com>
+
+       * acinclude.m4 (glibcpp_toolexeclibdir): Make multilib safe.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+       
 2001-06-26  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/stream_iterator.h (istream_iterator): Add copy ctor.

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 778731d349d0935225634519bbf6019e706af517..6f376dbac3f1e636febd3be541fe422d989258e1 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1623,7 +1623,7 @@ gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
 gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
 glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}
+glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
 changequote([,])dnl
 ],version_specific_libs=no)
 AC_MSG_RESULT($version_specific_libs)

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 61dc129b4020917c27484fdfc39b3f4d855eaa61..8b550bf6d7a229176cfa683f1543363264d57dbd 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1635,7 +1635,7 @@ gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
 gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
 glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}
+glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
 changequote([,])dnl
 ],version_specific_libs=no)
 AC_MSG_RESULT($version_specific_libs)

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ff6c272ebab99d67e75036c85158aa80c85b3495..341f8a4b47541dbedb431b5246f7bd5572b25a4c 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -16268,7 +16268,7 @@ gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
 gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
 glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}
+glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
 
 else
   version_specific_libs=no