aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-29 18:20:07 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-29 18:20:07 +0800
commit807c4cdfac49d1cf4d8eefbda394c2b53bd5598b (patch)
treed45dae4ed0e5e03b7a2c5ddb4bf6bc818dc4485a
parent0d3a21856b23f8ba591e833f77ff3a5bcb465d24 (diff)
downloadgsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.tar
gsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.tar.gz
gsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.tar.bz2
gsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.tar.lz
gsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.tar.xz
gsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.tar.zst
gsoc2013-empathy-807c4cdfac49d1cf4d8eefbda394c2b53bd5598b.zip
install empathy-av to libexec
-rw-r--r--data/Makefile.am2
-rw-r--r--data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in2
-rw-r--r--src/Makefile.am4
3 files changed, 5 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 3f03c80d0..64054da3f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -35,7 +35,7 @@ org.freedesktop.Telepathy.Client.Empathy.service: org.freedesktop.Telepathy.Clie
$(AM_V_GEN)sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@
org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service: org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
- $(AM_V_GEN)sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@
+ $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
clientfiledir = $(datarootdir)/telepathy/clients
clientfile_DATA = \
diff --git a/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in b/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
index b18bad074..177f395de 100644
--- a/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
+++ b/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.Client.Empathy.AudioVideo
-Exec=@bindir@/empathy-av
+Exec=@libexecdir@/empathy-av
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ef698ec2..eaac3c341 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,9 +79,11 @@ bin_PROGRAMS = \
empathy \
empathy-accounts \
empathy-debugger \
- empathy-av \
$(NULL)
+libexec_PROGRAMS = \
+ empathy-av
+
BUILT_SOURCES=
empathy_accounts_SOURCES = \