diff options
| author | <rob.taylor@collabora.co.uk> | 2006-01-19 09:08:12 +0000 |
|---|---|---|
| committer | <rob.taylor@collabora.co.uk> | 2006-01-19 09:08:12 +0000 |
| commit | 7bf0ee9360f8e9fcde6e87d2c75165896ca9649e (patch) | |
| tree | ded6ea67ab5d6e92ce613f765d733be85225816e | |
| parent | b264d69eb51b85fabe65dada4661e41b87ee9691 (diff) | |
make .service file generation actually work
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in (renamed from data/org.freedesktop.Telepathy.ConnectionManager.gabble.in) | 2 |
4 files changed, 13 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 2d607d739..42b680513 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = \ - src \ - data - -DIST_SUBDIRS = \ - m4 \ - tools +SUBDIRS = src data m4 tools EXTRA_DIST = \ jabber-connection-manager.xml \ diff --git a/configure.ac b/configure.ac index dff5a15b1..cf3d96b27 100644 --- a/configure.ac +++ b/configure.ac @@ -63,10 +63,9 @@ PKG_CHECK_MODULES(LOUDMOUTH, loudmouth-1.0) AC_SUBST(LOUDMOUTH_CFLAGS) AC_SUBST(LOUDMOUTH_LIBS) -AC_OUTPUT( Makefile - src/Makefile - m4/Makefile - tools/Makefile +AC_OUTPUT( Makefile \ + src/Makefile \ + m4/Makefile \ + tools/Makefile \ data/Makefile - data/org.freedesktop.Telepathy.ConnectionManager.gabble ) diff --git a/data/Makefile.am b/data/Makefile.am index 204205ae9..6dd1d6f86 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,2 +1,8 @@ +# Dbus service file servicedir = $(DBUS_SERVICES_DIR) -service_DATA = org.freedesktop.Telepathy.ConnectionManager.gabble +service_in_files = org.freedesktop.Telepathy.ConnectionManager.gabble.service.in +service_DATA = $(service_in_files:.service.in=.service) + +# Rule to make the service file with bindir expanded +$(service_DATA): $(service_in_files) Makefile + @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ diff --git a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.in b/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in index 5d57db2a3..1988259cc 100644 --- a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.in +++ b/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.ConnectionManager.gabble -Exec=@EXEC_DIR@/telepathy-gabble +Exec=@bindir@/telepathy-gabble |