[oe-commits] Otavio Salvador : qmake_base.bbclass: use using parallel staging dirs

git version control git at git.openembedded.org
Tue May 10 15:01:53 UTC 2011


Module: meta-openembedded.git
Branch: master
Commit: aef16efcd8e3d4b74b4e0c640ae20911c092d753
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=aef16efcd8e3d4b74b4e0c640ae20911c092d753

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue May 10 14:47:07 2011 +0000

qmake_base.bbclass: use using parallel staging dirs

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

---

 meta-oe/classes/qmake_base.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-oe/classes/qmake_base.bbclass b/meta-oe/classes/qmake_base.bbclass
index 654c7c8..aa8c05b 100644
--- a/meta-oe/classes/qmake_base.bbclass
+++ b/meta-oe/classes/qmake_base.bbclass
@@ -38,11 +38,11 @@ do_generate_qt_config_file() {
 	export QT_CONF_PATH=${WORKDIR}/qt.conf
 	cat > ${WORKDIR}/qt.conf <<EOF
 [Paths]
-Prefix = ${STAGING_DIR}
-Binaries = ${BUILD_SYS}${bindir_native}
-Headers = ${MACHINE}${prefix}/include/qt4
-Plugins = ${MACHINE}${prefix}/lib/qt4/plugins/
-Mkspecs = ${MACHINE}${prefix}/share/qt4/mkspecs/
+Prefix =
+Binaries = ${STAGING_BINDIR_NATIVE}
+Headers = ${STAGING_INCDIR}/qt4
+Plugins = ${STAGING_LIBDIR}/qt4/plugins/
+Mkspecs = ${STAGING_DATADIR}/qt4/mkspecs/
 EOF
 }
 





More information about the Openembedded-commits mailing list