2004-02-09 Paolo Bonzini <bonzini@gnu.org>

[pf3gnuchains/gcc-fork.git] / libf2c / aclocal.m4

diff --git a/libf2c/aclocal.m4 b/libf2c/aclocal.m4
index b7d61e3..b84eda0 100644 (file)
--- a/libf2c/aclocal.m4
+++ b/libf2c/aclocal.m4
@@ -194,9 +194,10 @@ AC_SUBST(gcc_version_trigger)
 if test $version_specific_libs = yes; then
   # Need the gcc compiler version to know where to install libraries
   # and header files if --enable-version-specific-runtime-libs option
-  # is selected.
+  # is selected.  FIXME: "toolexecdir" is a misnomer, there are no
+  # executables installed there.
   changequote(,)dnl
-  glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
   glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
   changequote([,])dnl
 fi
@@ -207,11 +208,16 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
-    glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)'
+    glibcpp_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-    glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)'
+    glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
+    glibcpp_toolexeclibdir='$(libdir)'
   fi
+  multi_os_directory=`$CC -print-multi-os-directory`
+  case $multi_os_directory in
+    .) ;; # Avoid trailing /.
+    *) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
+  esac
 fi
 
 AC_SUBST(glibcpp_prefixdir)