* gcc_release (usage): Print more detailed description of all

[pf3gnuchains/gcc-fork.git] / zlib / configure.in

diff --git a/zlib/configure.in b/zlib/configure.in
index 8d8c3a9..0d5588d 100644 (file)
--- a/zlib/configure.in
+++ b/zlib/configure.in
@@ -121,7 +121,15 @@ else
   toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
   toolexeclibdir='$(libdir)'
 fi
-toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory 2>/dev/null || echo .`
+if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
+  multiosdir=/`$CC -print-multi-os-directory`
+  case $multiosdir in
+    /.) multiosdir= ;; # Avoid trailing /.
+  esac
+else
+  multiosdir=
+fi
+toolexeclibdir=${toolexeclibdir}${multiosdir}
 AC_SUBST(toolexecdir)
 AC_SUBST(toolexeclibdir)
 
@@ -147,4 +155,5 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 zlib_basedir=${zlib_basedir}
 CC="${CC}"
 CXX="${CXX}"
+ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
 )