summaryrefslogtreecommitdiff
path: root/salut
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-23 15:06:00 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-26 12:14:16 +0100
commit4b2480d928b3a3083ba21010607239cb8f85a40e (patch)
tree6df700721fd838ec4911b3f1f18904c492a62dad /salut
parente5ff6de77fbd5e02e8db5a7fcd1576fdc98d6343 (diff)
downloadtelepathy-salut-4b2480d928b3a3083ba21010607239cb8f85a40e.tar.gz
Install non-ABI-stable libraries used by plugins to a private directory
Similar to https://bugs.freedesktop.org/show_bug.cgi?id=46417 in Gabble. Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47774
Diffstat (limited to 'salut')
-rw-r--r--salut/telepathy-salut-uninstalled.pc.in1
-rw-r--r--salut/telepathy-salut.pc.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/salut/telepathy-salut-uninstalled.pc.in b/salut/telepathy-salut-uninstalled.pc.in
index 018ac924..ba10113c 100644
--- a/salut/telepathy-salut-uninstalled.pc.in
+++ b/salut/telepathy-salut-uninstalled.pc.in
@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
abs_top_srcdir=@abs_top_srcdir@
abs_top_builddir=@abs_top_builddir@
libdir=@libdir@
+pluginexeclibdir=@pluginexeclibdir@
plugindir=${libdir}/telepathy/salut-0
salutpath=${abs_top_builddir}/src/telepathy-salut
diff --git a/salut/telepathy-salut.pc.in b/salut/telepathy-salut.pc.in
index c124d1d8..8d01d6b5 100644
--- a/salut/telepathy-salut.pc.in
+++ b/salut/telepathy-salut.pc.in
@@ -5,6 +5,7 @@ includedir=@includedir@
libexecdir=@libexecdir@
plugindir=${libdir}/telepathy/salut-0
+pluginexeclibdir=@pluginexeclibdir@
salutpath=${libexecdir}/telepathy-salut
Name: Telepathy-Salut
@@ -12,5 +13,5 @@ Description: Link-local XMPP backend for the Telepathy framework
Version: @VERSION@
Requires: pkg-config >= 0.21
Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.13.12
-Libs: -L${libdir} -lsalut-plugins -lwocky
+Libs: -L${pluginexeclibdir} -lsalut-plugins -lwocky
Cflags: -I${includedir}/telepathy-salut-0