aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Terry <michael.terry@canonical.com>2013-02-15 17:20:14 +0000
committerTarmac <Unknown>2013-02-15 17:20:14 +0000
commitd24848fc0f31a0f1382df03bfa2456bc82eafe11 (patch)
treec20c8cef29179c8bafad11e79df67f864993bcd9
parent85c8d1cf1c4b56f8a612b6cc6a3c4215c735641d (diff)
parent6aea07d70c9640132277f920eec32957b3241945 (diff)
downloadlibayatana-indicator-d24848fc0f31a0f1382df03bfa2456bc82eafe11.tar.gz
libayatana-indicator-d24848fc0f31a0f1382df03bfa2456bc82eafe11.tar.bz2
libayatana-indicator-d24848fc0f31a0f1382df03bfa2456bc82eafe11.zip
Multiarch for most of libindicator is fine. But the indicators themselves should continue to be installed in the same (non-multiarch) directory, for historical reasons. Fixes: https://bugs.launchpad.net/bugs/1126360.
Approved by Ɓukasz Zemczak, PS Jenkins bot, Mathieu Trudel-Lapierre.
-rw-r--r--libindicator/indicator-0.4.pc.in.in2
-rw-r--r--libindicator/indicator3-0.4.pc.in.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/libindicator/indicator-0.4.pc.in.in b/libindicator/indicator-0.4.pc.in.in
index df4d6c8..b5de163 100644
--- a/libindicator/indicator-0.4.pc.in.in
+++ b/libindicator/indicator-0.4.pc.in.in
@@ -4,7 +4,7 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-indicatordir=${libdir}/indicators/@indicator_abi_version@
+indicatordir=${exec_prefix}/lib/indicators/@indicator_abi_version@
iconsdir=@datarootdir@/@PACKAGE@/icons/
Cflags: -I${includedir}/libindicator-0.@indicator_api_version@
diff --git a/libindicator/indicator3-0.4.pc.in.in b/libindicator/indicator3-0.4.pc.in.in
index d4b5f0f..e2ea0ae 100644
--- a/libindicator/indicator3-0.4.pc.in.in
+++ b/libindicator/indicator3-0.4.pc.in.in
@@ -4,7 +4,7 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-indicatordir=${libdir}/indicators3/@indicator_abi_version@/
+indicatordir=${exec_prefix}/lib/indicators3/@indicator_abi_version@/
iconsdir=@datarootdir@/@PACKAGE@/icons/
Cflags: -I${includedir}/libindicator3-0.@indicator_api_version@