--- libbonobo-2.13.1/configure.in.multishlib	2006-01-16 13:58:48.000000000 -0500
+++ libbonobo-2.13.1/configure.in	2006-01-26 14:40:41.000000000 -0500
@@ -233,6 +233,40 @@
 AC_SUBST(IF_BSD_PS)
 AC_SUBST(IF_POSIX_PS)
 
+multilib_server_files="no"
+AC_MSG_CHECKING(for multi-arch bonobo server paths)
+
+# hack stolen from dbus to expand libdir out
+if test "x$prefix" = "xNONE"; then
+  deduced_prefix=$ac_default_prefix
+else
+  deduced_prefix=$prefix
+fi
+
+old_prefix=$prefix
+prefix=$deduced_prefix
+
+if test "x$exec_prefix" = xNONE ; then
+   deduced_exec_prefix=$deduced_prefix
+else
+   deduced_exec_prefix=$exec_prefix
+fi
+old_exec_prefix=$exec_prefix
+exec_prefix=$deduced_exec_prefix
+expanded_libdir=`eval echo $libdir`
+prefix=$old_prefix
+
+if test "${exec_prefix}/lib" != "${expanded_libdir}"; then
+    multilib_server_files="yes"
+    AC_MSG_RESULT(yes)
+else
+    multilib_server_files="no"
+    AC_MSG_RESULT(no)
+fi
+exec_prefix=$old_exec_prefix
+
+AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "${multilib_server_files}" = "yes")
+
 AC_OUTPUT([
 Makefile
 libbonobo-zip
--- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2005-07-04 18:05:49.000000000 -0400
+++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-26 14:39:22.000000000 -0500
@@ -6,13 +6,20 @@
 libexec_PROGRAMS=bonobo-activation-server
 noinst_PROGRAMS=test-performance
 
+serverinfolibdir = $(libdir)/bonobo/servers
+
+if MULTILIB_SERVER_FILES
+	serverinfolibdir := $(exec_prefix)/lib/bonobo/servers
+endif
+
+
 INCLUDES=					\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir) 			\
 	-I$(top_builddir)/bonobo-activation	\
 	-I$(top_srcdir)/bonobo-activation	\
 	-DPREFIX=\""$(prefix)"\"		\
-	-DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \
+	-DSERVERINFODIR=\"$(serverinfolibdir)\" \
         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
 	$(SERVER_CFLAGS)			\
 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\