[oe-commits] Yi Zhao : libconnman-qt: fix the hardcoded libdir

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: f2a5f72cb0858c03cc4b3f1ec51abab5b0d44a26
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=f2a5f72cb0858c03cc4b3f1ec51abab5b0d44a26

Author: Yi Zhao <yi.zhao at windriver.com>
Date:   Fri Aug 21 14:34:09 2015 +0800

libconnman-qt: fix the hardcoded libdir

Fix QA issue when enable multilib:
ERROR: QA Issue: libconnman-qte: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libconnman-qtopia.prl
  /usr/lib/libconnman-qtopia.so.1.0
  /usr/lib/libconnman-qtopia.so.1.0.50
  /usr/lib/libconnman-qtopia.so
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao at windriver.com>

---

 meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
index 3f91be2..859c854 100644
--- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
@@ -17,6 +17,7 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=notests TARGET_SUFFIX=${QT_DIR_NAME}"
 do_configure_prepend() {
     # Hack *.pro variables
     find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
+    find ${S} -iname '*.pro' -exec sed -i -e 's,$$INSTALL_ROOT$$PREFIX/lib,$$INSTALL_ROOT$$PREFIX/${baselib},g' '{}' ';'
 }
 do_install() {
     oe_runmake install INSTALL_ROOT=${D}