[evolution-patches] Patch to Configure Bonobo Activation Path for Odd Prefixes
- From: Rodney Dawes <dobey ximian com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] Patch to Configure Bonobo Activation Path for Odd Prefixes
- Date: Mon, 28 Jul 2003 11:28:52 -0400
Here's a patch to add the prefix that evolution is installed to,
to the bonobo activation config file, so that installing to a
separate prefix than bonobo-activation, will still result in a
working install. bonobo-activation-server needs to be restarted,
and since "pkill bonobo-activation-server" doesn't seem to work
on linux, and specifying the path doesn't work too well either,
and there's no reliably portable way to do it otherwise for now,
I left it out of the install rule, and packagers (ie, me), can
do what's necessary for the specific platform(s), in the postinst
rules, that should copy what this does inside the if statement.
-- dobey
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.591.2.3
diff -u -r1.591.2.3 configure.in
--- configure.in 18 Jul 2003 12:41:06 -0000 1.591.2.3
+++ configure.in 28 Jul 2003 15:25:34 -0000
@@ -1030,6 +1030,11 @@
AC_MSG_RESULT($IDL_INCLUDES)
AC_SUBST(IDL_INCLUDES)
+BA_SYSCONF_PREFIX="`$PKG_CONFIG --variable=prefix bonobo-activation-2.0`"
+PATH="${PATH}:${BA_SYSCONF_PREFIX}/sbin"
+AC_PATH_PROG(BA_SYSCONF_BIN, bonobo-activation-sysconf, no)
+AC_SUBST(BA_SYSCONF_PREFIX)
+
AM_PATH_GLIB_2_0
dnl Utility macro to set compiler flags for a specific lib.
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.158
diff -u -r1.158 Makefile.am
--- shell/Makefile.am 16 Jun 2003 17:19:58 -0000 1.158
+++ shell/Makefile.am 28 Jul 2003 15:25:35 -0000
@@ -308,7 +308,12 @@
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = apps_evolution_shell.schemas
-install-data-local:
+install-bonobo-conf:
+ if test -z "$(DESTDIR)" -a -z "`${BA_SYSCONF_BIN} --display-directories|grep '@prefix@/lib/bonobo/servers'`"; then \
+ ${BA_SYSCONF_BIN} --add-directory= prefix@/lib/bonobo/servers; \
+ fi
+
+install-data-local: install-bonobo-conf
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]