[evolution-activesync] Make dbus service installation consistent with evolution
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-activesync] Make dbus service installation consistent with evolution
- Date: Mon, 21 May 2012 14:45:02 +0000 (UTC)
commit 4ab67abd06dc6fa5c0cd36c2a123b430d90ee40b
Author: David Woodhouse <David Woodhouse intel com>
Date: Mon May 21 15:43:28 2012 +0100
Make dbus service installation consistent with evolution
Probably not entirely correct; it was better to get it from pkgconfig.
But if evo can get away with unconditionally using $prefix/dbus-1/services
then so can we, and it makes testing a little easier.
configure.ac | 3 ---
eas-daemon/data/Makefile.am | 2 +-
2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 56788dd..f78ed0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,9 +100,6 @@ PKG_CHECK_MODULES([MLITE],
AC_MSG_NOTICE([MeeGo ActiveSync Settings UI will not be built])])
-dbus_servicesdir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-AC_SUBST(dbus_servicesdir)
-
camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir ${CAMEL_PKG}`
AC_SUBST(camel_providerdir)
diff --git a/eas-daemon/data/Makefile.am b/eas-daemon/data/Makefile.am
index b2fd105..05b206a 100644
--- a/eas-daemon/data/Makefile.am
+++ b/eas-daemon/data/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
# Dbus service file
-servicedir = $(dbus_servicesdir)
+servicedir = $(datadir)/dbus-1/services
service_in_files = org.meego.activesyncd.service.in
service_DATA = $(service_in_files:.service.in=.service)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]