2f5eb3
diff -up cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib cairo-1.12.14/util/cairo-trace/cairo-trace.in
2f5eb3
--- cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib	2013-07-18 16:03:38.044832193 -0400
2f5eb3
+++ cairo-1.12.14/util/cairo-trace/cairo-trace.in	2013-07-18 16:03:43.981882777 -0400
2f5eb3
@@ -2,6 +2,12 @@
2f5eb3
 
2f5eb3
 prefix=@prefix@
2f5eb3
 exec_prefix=@exec_prefix@
2f5eb3
+case `uname -m` in
2f5eb3
+  x86_64|s390x|ppc64) libdir=@prefix@/lib64
2f5eb3
+    ;;
2f5eb3
+  *) libdir=@prefix@/lib
2f5eb3
+    ;;
2f5eb3
+esac
2f5eb3
 
2f5eb3
 nofile=
2f5eb3
 flush=
2f5eb3
@@ -90,7 +96,7 @@ export CAIRO_TRACE_PROG_NAME
2f5eb3
 
2f5eb3
 if test "x$CAIRO_TRACE_SO" = "x"; then
2f5eb3
     CAIRO_TRACE_SO=""
2f5eb3
-    for lib in @libdir@/cairo/libcairo-trace.@SHLIB_EXT@ @libdir@/cairo/libcairo-trace.@SHLIB_EXT@* @libdir@/cairo/libcairo-trace.*.@SHLIB_EXT@ ; do
2f5eb3
+    for lib in $libdir/cairo/libcairo-trace.@SHLIB_EXT@ $libdir/cairo/libcairo-trace.@SHLIB_EXT@* $libdir/cairo/libcairo-trace.*.@SHLIB_EXT@ ; do
2f5eb3
 	if test -h "$lib" -o -f "$lib"; then
2f5eb3
 	    CAIRO_TRACE_SO="$lib"
2f5eb3
 	    break
2f5eb3
@@ -98,7 +104,7 @@ if test "x$CAIRO_TRACE_SO" = "x"; then
2f5eb3
     done
2f5eb3
 fi
2f5eb3
 if test "x$CAIRO_TRACE_SO" = "x"; then
2f5eb3
-    echo "Could not find the cairo-trace shared library in @libdir@/cairo/." >&2
2f5eb3
+    echo "Could not find the cairo-trace shared library in $libdir/cairo/." >&2
2f5eb3
     echo "Set the CAIRO_TRACE_SO environment variable to the full path of the library." >&2
2f5eb3
     exit 15
2f5eb3
 fi