diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-26 11:00:17 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-26 11:00:17 +0000 |
| commit | 53d3887290c26ba52c31e82e19e68d90bf5a645a (patch) | |
| tree | 4995e937758116b36445723fcede6dbcb06fb20d | |
| parent | 15278c1f09a33c0fc4d4f72520a757ca0fd6d577 (diff) | |
Install telepathy-gabble in libexecdir, adjust .service accordingly
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index e9ecced9c..d62caa77e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -13,9 +13,9 @@ CLEANFILES = $(BUILT_FILES) EXTRA_DIST = $(service_in_files) -# Rule to make the service file with bindir expanded +# Rule to make the service file with libexecdir expanded $(service_DATA): $(service_in_files) Makefile - @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ + @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/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in index 1988259cc..925e7a8b8 100644 --- a/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in +++ b/data/org.freedesktop.Telepathy.ConnectionManager.gabble.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.ConnectionManager.gabble -Exec=@bindir@/telepathy-gabble +Exec=@libexecdir@/telepathy-gabble diff --git a/src/Makefile.am b/src/Makefile.am index ac306807e..897ae2ca4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -bin_PROGRAMS=telepathy-gabble +libexec_PROGRAMS=telepathy-gabble noinst_PROGRAMS = write-mgr-file if HAVE_DBUS_TUBE |