From 95bf83c298e779d4edd4b712443297eb072a58a1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 21 Apr 2008 13:19:32 +0000
Subject: Don't distribute .service.in file with insanely long name (patch from
 my Gabble branch)

20080421131932-53eee-568b21973e005135bffa5098629be745ed4ea9b5.gz
---
 data/Makefile.am                                    | 21 ++++++++-------------
 ...top.Telepathy.ConnectionManager.salut.service.in |  3 ---
 data/salut.service.in                               |  3 +++
 3 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in
 create mode 100644 data/salut.service.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index caa02fd5..cea1946c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,22 +1,17 @@
-# Telepathy manager file
+EXTRA_DIST = salut.service.in
+
 managerdir = $(datadir)/telepathy/managers
 manager_DATA = salut.manager
 
-# Dbus service file
-servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = org.freedesktop.Telepathy.ConnectionManager.salut.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-BUILT_FILES = $(service_DATA) $(manager_DATA)
-
-CLEANFILES = $(BUILT_FILES)
+servicedir = $(datadir)/dbus-1/services
+service_DATA = salut.service.in
 
-EXTRA_DIST = $(service_in_files)
-
-# Rule to make the service file with libexecdir expanded
-$(service_DATA): $(service_in_files) Makefile
+org.freedesktop.Telepathy.ConnectionManager.salut.service: salut.service.in \
+		Makefile
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
+CLEANFILES = $(service_DATA) $(manager_DATA)
+
 $(manager_DATA): always-build
 	$(MAKE) -C ../src write-mgr-file
 	../src/write-mgr-file > $@
diff --git a/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in b/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in
deleted file mode 100644
index 322aea76..00000000
--- a/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.ConnectionManager.salut
-Exec=@libexecdir@/telepathy-salut
diff --git a/data/salut.service.in b/data/salut.service.in
new file mode 100644
index 00000000..322aea76
--- /dev/null
+++ b/data/salut.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.ConnectionManager.salut
+Exec=@libexecdir@/telepathy-salut
-- 
cgit v1.2.1