From ca4c4eea5f28c85d1ba490c1f4bfbc605de8b205 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:54:48 +0200 Subject: [PATCH] qtjsbackend: Fix installation, now it's also prefixed with sysroot * like in qtbase Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 69aad92251..a7e956d883 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -28,8 +28,12 @@ do_configure () { } do_install_append () { - mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/mkspecs - TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs` + # everything except HostData and HostBinaries is prefixed with sysroot value, + # but we cannot remove sysroot override, because that's useful for pkg-config etc + cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} + rm -rf ${D}${STAGING_DIR_TARGET} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_TARGET}` while test ${TMP} != ${D}; do rmdir ${TMP} TMP=`dirname ${TMP}`;