summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am20
-rw-r--r--data/gabble.service.in (renamed from data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in)0
2 files changed, 9 insertions, 11 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index d62caa77e..8435179db 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,21 +1,19 @@
-# Telepathy manager file
+EXTRA_DIST = gabble.service.in
+
managerdir = $(datadir)/telepathy/managers
manager_DATA = gabble.manager
-# Dbus service file
-servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = org.freedesktop.Telepathy.ConnectionManager.gabble.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-BUILT_FILES = $(service_DATA) $(manager_DATA)
+servicedir = $(datadir)/dbus-1/services
+service_DATA = org.freedesktop.Telepathy.ConnectionManager.gabble.service
-CLEANFILES = $(BUILT_FILES)
+org.freedesktop.Telepathy.ConnectionManager.gabble.service: gabble.service.in \
+ Makefile
+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = $(service_in_files)
+CLEANFILES = $(service_DATA) $(manager_DATA)
-# Rule to make the service file with libexecdir expanded
$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
$(manager_DATA): ../src/gabble-connection-manager.c ../src/write-mgr-file.c
$(MAKE) -C ../src write-mgr-file
diff --git a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in b/data/gabble.service.in
index 925e7a8b8..925e7a8b8 100644
--- a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in
+++ b/data/gabble.service.in