Patchwork [meta-oe,v1,3/4] qmake_base.bbclass: use using parallel staging dirs

login
mail settings
Submitter Otavio Salvador
Date May 10, 2011, 2:51 p.m.
Message ID <1305039065-1326-3-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/3655/
State New, archived
Headers show

Comments

Otavio Salvador - May 10, 2011, 2:51 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/classes/qmake_base.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

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
 }