diff options
Diffstat (limited to 'contrib/libf2c/aclocal.m4')
| -rw-r--r-- | contrib/libf2c/aclocal.m4 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/contrib/libf2c/aclocal.m4 b/contrib/libf2c/aclocal.m4 index 5d39edc..b84eda0 100644 --- a/contrib/libf2c/aclocal.m4 +++ b/contrib/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 @@ -209,10 +210,14 @@ if test x"$glibcpp_toolexecdir" = x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' glibcpp_toolexeclibdir='$(toolexecdir)/lib' else - glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)' glibcpp_toolexeclibdir='$(libdir)' fi - glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` + 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) |
