From 7a82db888f516660784492bc9e37c43518971edf Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 17 Apr 2008 13:49:50 +0000
Subject: Simplify data/Makefile.am and rename .service.in filename to be
 shorter.

Shortening the filename should mean we no longer need to use tar-ustar,
since we're much less likely to hit the old 99-character tarball filename
limit, even if we do a datestamped prerelease like
`make dist distdir=telepathy-gabble-0.7.3.1-prerelease-20080416` (prereleases
for laptop.org were the original motivation for using tar-ustar).

20080417134950-53eee-6c79c938c35e9b4dbe60348636f38a0fb64d1574.gz
---
 data/Makefile.am                                     | 20 +++++++++-----------
 data/gabble.service.in                               |  3 +++
 ...top.Telepathy.ConnectionManager.gabble.service.in |  3 ---
 3 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 data/gabble.service.in
 delete mode 100644 data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in

(limited to 'data')

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/gabble.service.in b/data/gabble.service.in
new file mode 100644
index 000000000..925e7a8b8
--- /dev/null
+++ b/data/gabble.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.ConnectionManager.gabble
+Exec=@libexecdir@/telepathy-gabble
diff --git a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in b/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in
deleted file mode 100644
index 925e7a8b8..000000000
--- a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.ConnectionManager.gabble
-Exec=@libexecdir@/telepathy-gabble
-- 
cgit v1.2.3