From e89e33fd173fc4006218e99ed363ca292d0a9644 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 26 Apr 2013 20:54:26 +0200 Subject: 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 --- classes/qmake5_base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index c2bccbfc..d114c548 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,7 +1,7 @@ # This is useful for target recipes to reference native mkspecs -QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}" -QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}" QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds @@ -39,7 +39,7 @@ do_generate_qt_config_file() { [Paths] Prefix = ${prefix} Binaries = ${bindir}/${QT_DIR_NAME} -Libraries = ${libdir}/${QT_DIR_NAME} +Libraries = ${libdir} Headers = ${includedir}/${QT_DIR_NAME} Data = ${datadir}/${QT_DIR_NAME} ArchData = ${libdir}/${QT_DIR_NAME} -- cgit v1.2.3-54-g00ecf