Drop dbus-services-dir configure flag

5 files changed, 10 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index cecaf184..d4702b77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ zeitgeistdoc_DATA = \
 	$(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--with-session-bus-services-dir="\$(datadir)"/dbus-1/services \
 	--enable-datahub \
 	--enable-fts \
 	--enable-docs \
diff --git a/configure.ac b/configure.ac
index abdf3e44..a3371248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,23 +101,6 @@ fi
 AM_CONDITIONAL(HAVE_DEE_ICU, test "x$with_dee_icu" = "xyes")
 
 #################################################
-# DBus service
-#################################################
-
-AC_ARG_WITH([session_bus_services_dir],
-            AC_HELP_STRING([--with-session-bus-services-dir], [Path to DBus services directory]))
-
-if test "x$with_session_bus_services_dir" = "x" ; then
-	PKG_CHECK_MODULES(DBUS_MODULE, "dbus-1")
-	services_dir="`$PKG_CONFIG --variable session_bus_services_dir dbus-1`"
-else
-	services_dir="$with_session_bus_services_dir"
-fi
-
-DBUS_SERVICES_DIR="$services_dir"
-AC_SUBST(DBUS_SERVICES_DIR)
-
-#################################################
 # Configure option: --enable-explain-queries
 #################################################
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 5cedd84d..ae148b32 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,12 +4,8 @@ SUBDIRS = \
 	ontology \
 	$(NULL)
 
-servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = org.gnome.zeitgeist.service
-
-org.gnome.zeitgeist.service: org.gnome.zeitgeist.service.in
-	$(AM_V_GEN)sed -e s!\@prefix\@!$(prefix)! < $< > $@
-org.gnome.zeitgeist.service: Makefile
+servicedir = $(datadir)/dbus-1/services
+nodist_service_DATA = org.gnome.zeitgeist.service
 
 bashcompletiondir = $(datadir)/bash-completion/completions
 dist_bashcompletion_DATA = completions/zeitgeist-daemon
@@ -18,7 +14,7 @@ xdgautostart_in_files = zeitgeist-datahub.desktop.in
 
 if ENABLE_DATAHUB
 xdgautostartdir=$(sysconfdir)/xdg/autostart
-xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
+nodist_xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 endif
 
 CLEANFILES = \
@@ -33,10 +29,11 @@ EXTRA_DIST = \
 	$(xdgautostart_in_files) \
 	$(NULL)
 
-all-local: org.gnome.zeitgeist.service
-
 %.desktop: %.desktop.in
 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
+%.service: %.service.in
+	$(AM_V_GEN)sed -e "s|@bindir[@]|$(bindir)|" $< > $@
+
 clean:
 	rm -rf *.pyc *.~[0-9]~
diff --git a/data/org.gnome.zeitgeist.service.in b/data/org.gnome.zeitgeist.service.in
index 180116f7..4b20045c 100644
--- a/data/org.gnome.zeitgeist.service.in
+++ b/data/org.gnome.zeitgeist.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.zeitgeist.Engine
-Exec=@prefix@/bin/zeitgeist-daemon
+Exec=@bindir@/zeitgeist-daemon
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index 0ebf2063..305feb2a 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -4,12 +4,11 @@ SUBDIRS = test
 
 libexec_PROGRAMS = zeitgeist-fts
 
-servicedir = $(DBUS_SERVICES_DIR)
+servicedir = $(datadir)/dbus-1/services
 nodist_service_DATA = org.gnome.zeitgeist.fts.service
 
-org.gnome.zeitgeist.fts.service: org.gnome.zeitgeist.fts.service.in
-	$(AM_V_GEN)sed  -e s!\@libexecdir\@!$(libexecdir)! < $< > $@
-org.gnome.zeitgeist.fts.service: Makefile
+%.service: %.service.in
+	$(AM_V_GEN)sed -e "s|@libexecdir[@]|$(libexecdir)|" $< > $@
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \