From 32165f04d49082773dbf6b78afe5506cba522f76 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 11:01:28 +0200 Subject: [PATCH] qtbase-native: fix install paths * 5.0.2+git was installing uic in wrong directory STAGING_DIR_NATIVE was there twice, while debuging this I've noticed that headers and docs are installed in this wrong directory also in other versions Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index b3007a50fe..0d76d2f5d2 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -88,5 +88,20 @@ do_configure_prepend() { } do_install() { + # Fix install paths for all + find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" + oe_runmake install INSTALL_ROOT=${D} + + if [ -d ${D}${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE} ] ; then + echo "Some files are installed in wrong directory ${D}${STAGING_DIR_NATIVE}" + cp -ra ${D}${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE}/* ${D}${STAGING_DIR_NATIVE} + rm -rf ${D}${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE}` + while test ${TMP} != ${D}${STAGING_DIR_NATIVE}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done + fi }