qmake_base: remove QT_DIR_NAME from libdir

* using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be
  installed in this prefix too
* modify ArchData variable to move mkspecs files to qt5 prefix (so that
  they don't conflict with qt4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 4 insertions, 3 deletions

diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 06320aae..41531e52 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -55,6 +55,7 @@ EXTRA_OECONF = " \
     -release \
     -prefix ${prefix} \
     -bindir ${bindir}/${QT_DIR_NAME} \
+    -libdir ${libdir} \
     -headerdir ${includedir}/${QT_DIR_NAME} \
     -archdatadir ${libdir}/${QT_DIR_NAME} \
     -datadir ${datadir}/${QT_DIR_NAME} \
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 2664d2cb..69251835 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -65,7 +65,7 @@ do_configure_append() {
         -no-gcc-sysroot \
         -prefix ${prefix} \
         -bindir ${bindir}/${QT_DIR_NAME} \
-        -libdir ${libdir}/${QT_DIR_NAME} \
+        -libdir ${libdir} \
         -datadir ${datadir}/${QT_DIR_NAME} \
         -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
         -docdir ${docdir}/${QT_DIR_NAME} \
@@ -98,7 +98,7 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/qmake
-    mv ${D}${B}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs
+    mv ${D}${B}/mkspecs ${D}${libdir}/mkspecs
     TMP=`dirname ${D}/${B}/mkspecs`
     while test ${TMP} != ${D}; do
         rmdir ${TMP}
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
index 13a5df51..707e1da4 100644
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -26,7 +26,7 @@ do_configure () {
 }
 
 do_install_append () {
-    mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs
+    mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/mkspecs
     TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs`
     while test ${TMP} != ${D}; do
         rmdir ${TMP}