diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-29 11:59:52 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-05 12:56:34 +0200 |
| commit | d57e27ec08164d1c06e7f5169aa0fb23725f78b4 (patch) | |
| tree | 064fe85f00e47ce2120836b3af10f3b6480c99aa /recipes-qt/qt5/qt5.inc | |
| parent | cd2ac1d786da2be205f8059da9f58f919fa4a24b (diff) | |
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/qt5/qt5.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 15 |
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() { } do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # everything except HostData and HostBinaries is prefixed with sysroot value, - # but we cannot remove sysroot override, because that's useful for pkg-config etc - if [ -d ${D}${STAGING_DIR_TARGET} ] ; then - 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}`; - done - fi + qmake5_base_do_install } PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " |