diff -up libbonobo-2.23.1/activation-server/Makefile.am.multishlib libbonobo-2.23.1/activation-server/Makefile.am --- libbonobo-2.23.1/activation-server/Makefile.am.multishlib 2007-01-01 18:46:55.000000000 -0500 +++ libbonobo-2.23.1/activation-server/Makefile.am 2008-08-22 20:23:53.000000000 -0400 @@ -6,13 +6,15 @@ bin_PROGRAMS=activation-client libexec_PROGRAMS=bonobo-activation-server noinst_PROGRAMS=test-performance +serverinfolibdir = $(libdir)/bonobo/servers:$(exec_prefix)/lib/bonobo/servers + 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) \ $(WARN_CFLAGS) \