From: Zoltan Hidvegi <hzoli@austin.ibm.com>
Date: Tue, 26 Jun 2001 23:35:19 +0000 (+0000)
Subject: acinclude.m4 (glibcpp_toolexeclibdir): Make multilib safe.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f34f2346339d7d44d15582758283b8829bebba92;p=gcc.git

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 18b3b5d22d0..19bed9a51ab 100644
--- 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 778731d349d..6f376dbac3f 100644
--- 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 61dc129b402..8b550bf6d7a 100644
--- 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 ff6c272ebab..341f8a4b475 100755
--- 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