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