summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-26 10:59:25 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-26 10:59:25 +0000
commit42573392fff5344ffd5b6f61ba25710befee0f81 (patch)
tree740aa67ef649367ef422e2c214126243193d758f /data
parentb5ad93835e5b5e3181d332821d354781a114d091 (diff)
downloadtelepathy-salut-42573392fff5344ffd5b6f61ba25710befee0f81.tar.gz
Install telepathy-salut in libexecdir, adjust .service accordingly
20071026105925-53eee-2a53c7862a63ef32bd4f06b69703fb1d559c69e4.gz
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am4
-rw-r--r--data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index c0b69296..caa02fd5 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): always-build
$(MAKE) -C ../src write-mgr-file
diff --git a/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in b/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in
index f9cd05d0..322aea76 100644
--- a/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in
+++ b/data/org.freedesktop.Telepathy.ConnectionManager.salut.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.ConnectionManager.salut
-Exec=@bindir@/telepathy-salut
+Exec=@libexecdir@/telepathy-salut