diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 15:16:18 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 15:55:10 +0200 |
| commit | 7d3f0711eefea2aa60d6d5b1dc4aa2eec3c97098 (patch) | |
| tree | 1a0cc0fdff89043a90b07abf77cab34d1e3e0bc8 /recipes-qt/qt5/qt5.inc | |
| parent | 0a88f92505f27944e985c9f54e64c04b082778fb (diff) | |
qt5: move do_install modifications to shared qt5.inc and reuse do_configure
Diffstat (limited to 'recipes-qt/qt5/qt5.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a45c0aab..a4ac90b6 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -81,6 +81,19 @@ 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 } PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " |