diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-21 13:19:32 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-21 13:19:32 +0000 |
| commit | 95bf83c298e779d4edd4b712443297eb072a58a1 (patch) | |
| tree | 94e0c0be61dd5b8c522e2c7173176c81db3e9cd5 /data | |
| parent | 7aea6b5ce4246b70983e93cff3454a3a627a32c1 (diff) | |
| download | telepathy-salut-95bf83c298e779d4edd4b712443297eb072a58a1.tar.gz | |
Don't distribute .service.in file with insanely long name (patch from my Gabble branch)
20080421131932-53eee-568b21973e005135bffa5098629be745ed4ea9b5.gz
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 21 | ||||
| -rw-r--r-- | data/salut.service.in (renamed from data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in) | 0 |
2 files changed, 8 insertions, 13 deletions
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/salut.service.in index 322aea76..322aea76 100644 --- a/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in +++ b/data/salut.service.in |