diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-17 13:49:50 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-17 13:49:50 +0000 |
| commit | 7a82db888f516660784492bc9e37c43518971edf (patch) | |
| tree | 3ee564a1f75ebad3479dff74430d5a4fab9252e8 /data | |
| parent | 25549f4e68e734141272d46e77466ad715d1925a (diff) | |
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
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 20 | ||||
| -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 |