--- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2006-01-18 18:42:26.000000000 -0500
+++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-18 18:43:24.000000000 -0500
@@ -6,13 +6,19 @@
 libexec_PROGRAMS=bonobo-activation-server
 noinst_PROGRAMS=test-performance
 
+serverinfolibdir = $(libdir)/bonobo/servers
+
+ifneq ($(libdir), $(exec_prefix)/lib)
+serverinfolibdir := $(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)\"	\