summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-28 12:37:22 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-28 12:48:27 +0200
commit7b5e47bb0311dff7a9469c4128afd317c1b83f21 (patch)
treeeeaa2b2dd38ccf0299217a2ce1c5b66e38e9434e
parentf341ebddb803a615868a2a6645bc73e39ec12900 (diff)
install the logger to libexec
-rw-r--r--data/Makefile.am2
-rw-r--r--data/org.freedesktop.Telepathy.Client.Logger.service.in2
-rw-r--r--data/org.freedesktop.Telepathy.Logger.service.in2
-rw-r--r--src/Makefile.am2
4 files changed, 4 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 4c1334a..07608da 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ servicefile_in_files = \
org.freedesktop.Telepathy.Logger.service.in
servicefile_DATA = $(servicefile_in_files:.service.in=.service)
%.service: %.service.in Makefile
- $(AM_V_GEN)sed -e "s|%bindir%|$(bindir)|" $< > $@
+ $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
clientfiledir = $(datarootdir)/telepathy/clients
clientfile_DATA = Logger.client
diff --git a/data/org.freedesktop.Telepathy.Client.Logger.service.in b/data/org.freedesktop.Telepathy.Client.Logger.service.in
index fde5d46..a5e7251 100644
--- a/data/org.freedesktop.Telepathy.Client.Logger.service.in
+++ b/data/org.freedesktop.Telepathy.Client.Logger.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.Client.Logger
-Exec=%bindir%/telepathy-logger
+Exec=@libexecdir@/telepathy-logger
diff --git a/data/org.freedesktop.Telepathy.Logger.service.in b/data/org.freedesktop.Telepathy.Logger.service.in
index 70213b4..684fb90 100644
--- a/data/org.freedesktop.Telepathy.Logger.service.in
+++ b/data/org.freedesktop.Telepathy.Logger.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.Logger
-Exec=%bindir%/telepathy-logger
+Exec=@libexecdir@/telepathy-logger
diff --git a/src/Makefile.am b/src/Makefile.am
index 85ad8e4..19cf181 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
BUILT_SOURCES =
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
telepathy-logger
noinst_PROGRAMS = \