Merge pull request #7 from levonmaa/master

Fix up prl and pkgconfig file generation and paths for the qt.conf

2 files changed, 6 insertions, 1 deletions

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 09cb3ea5..ee5ff780 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -21,7 +21,7 @@ do_generate_qt_config_file() {
 Binaries = ${bindir}
 Headers = ${STAGING_INCDIR}/qt5
 Plugins = ${libdir}/qt5/plugins
-Libraries = ${libdir}
+Libraries = ${STAGING_LIBDIR}
 Imports = ${datadir}/qt5/imports
 Qml2Imports = ${libdir}/qt5/qml
 Documentation=${docdir}/qt5
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 52c95a3a..2784465f 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -53,6 +53,11 @@ do_configure_append() {
             ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf
     rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules*
 
+    ### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib
+    ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR}
+    sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf
+    sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf
+
     ### Remove the old pri files
     rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri