Index: configure
--- configure.orig	2011-09-03 14:51:07.000000000 +0200
+++ configure	2011-11-14 19:43:06.000000000 +0100
@@ -4350,7 +4350,7 @@
 	libdir='${exec_prefix}/lib'
 	;;
       *:solaris*:64|*:sunos*:64)
-	libdir='${exec_prefix}/lib/64'
+	libdir='${exec_prefix}/lib'
 	;;
       # Linux conventions are a mess... According to the Linux File
       # Hierarchy Standard, all architectures except IA64 puts 32-bit
@@ -4370,14 +4370,14 @@
 	  # symlink names. Use -P option, and hope it's portable enough.
 	  test -d /usr/lib${ABI} \
 	    && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
-	    && libdir='${exec_prefix}/'"lib${ABI}"
+	    && libdir='${exec_prefix}/'"lib"
 	fi
 	;;
       # On freebsd, it seems 32-bit libraries are in lib32,
       # and 64-bit in lib. Don't know about "kfreebsd", does
       # it follow the Linux fhs conventions?
       *:freebsd*:32)
-	libdir='${exec_prefix}/lib32'
+	libdir='${exec_prefix}/lib'
 	;;
       *:freebsd*:64)
 	libdir='${exec_prefix}/lib'
