summaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-29 11:59:52 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-05 12:56:34 +0200
commitd57e27ec08164d1c06e7f5169aa0fb23725f78b4 (patch)
tree064fe85f00e47ce2120836b3af10f3b6480c99aa /recipes-qt
parentcd2ac1d786da2be205f8059da9f58f919fa4a24b (diff)
downloadmeta-qt5-d57e27ec08164d1c06e7f5169aa0fb23725f78b4.tar.gz
qt5: Instead of fixing paths after installation, fix them in Makefile before
* thanks to Mikko Levonmaa * move it from qt5.inc to qmake5_base.bbclass, because it can be useful for other apps too Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/qt5.inc15
1 files changed, 1 insertions, 14 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4e78577a..474eee21 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -82,20 +82,7 @@ do_compile() {
82} 82}
83 83
84do_install() { 84do_install() {
85 oe_runmake install INSTALL_ROOT=${D} 85 qmake5_base_do_install
86
87 # everything except HostData and HostBinaries is prefixed with sysroot value,
88 # but we cannot remove sysroot override, because that's useful for pkg-config etc
89 if [ -d ${D}${STAGING_DIR_TARGET} ] ; then
90 cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
91 rm -rf ${D}${STAGING_DIR_TARGET}
92 # remove empty dirs
93 TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
94 while test ${TMP} != ${D}; do
95 rmdir ${TMP}
96 TMP=`dirname ${TMP}`;
97 done
98 fi
99} 86}
100 87
101PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " 88PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs "