qt, qte, qt4: Use better staging variables

diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc
index a68575d..745c7fa 100644 (file)
--- a/packages/qt/qt-x11-free-common.inc
+++ b/packages/qt/qt-x11-free-common.inc
@@ -9,7 +9,7 @@ S = "${WORKDIR}/qt-x11-free-${PV}"
 inherit qmake_base qt3x11
 
 export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
 ARCH_i686 = "x86"
 EXTRA_OEMAKE = "-e"
 

diff --git a/packages/qt/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb
index 2ed3da4..f23d874 100644 (file)
--- a/packages/qt/qt-x11-free-native_3.3.5.bb
+++ b/packages/qt/qt-x11-free-native_3.3.5.bb
@@ -41,16 +41,16 @@ do_compile() {
 }
 
 do_stage() {
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt3/lib
-       oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR}/${HOST_SYS}/qt3/lib
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+       install -d ${STAGING_DIR_HOST}/qt3/lib
+       oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR_HOST}/qt3/lib
+       install -d ${STAGING_DIR_HOST}/qt3/include/private
        for f in include/*.h
        do
-               install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/
+               install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/
        done
        for f in include/private/*.h
        do
-               install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+               install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/private
        done
 }
 

diff --git a/packages/qt4/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb
index 77fa6db..54c7064 100644 (file)
--- a/packages/qt4/qt4-x11-free_4.1.2.bb
+++ b/packages/qt4/qt4-x11-free_4.1.2.bb
@@ -22,7 +22,7 @@ PARALLEL_MAKE = ""
 inherit qmake_base qt4x11 pkgconfig
 
 export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
+STAGING_QT_DIR = "${STAGING_DIR_TARGET}/qt4"
 EXTRA_OEMAKE = "-e"
 
 require qt4_arch.inc

diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 5f9c01b..9b69b00 100644 (file)
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -134,13 +134,13 @@ do_compile() {
 }
 
 do_stage() {
-       rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-       oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+       rm -rf ${STAGING_DIR_HOST}/qt2
+       install -d ${STAGING_DIR_HOST}/qt2/lib
+       oe_libinstall -so -C lib lib${PN} ${STAGING_DIR_HOST}/qt2/lib
        rm -f include/qxt.h
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-       cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-       cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+       install -d ${STAGING_DIR_HOST}/qt2/include
+       cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+       cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
 }
 
 do_install() {

diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb
index c7d9623..68ab2ac 100644 (file)
--- a/packages/qte/qte-mt-static_2.3.10.bb
+++ b/packages/qte/qte-mt-static_2.3.10.bb
@@ -6,13 +6,13 @@ DEFAULT_PREFERENCE = "-1"
 EXTRA_OECONF += "-static -thread"
 
 do_stage() {
-       rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-       oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+       rm -rf ${STAGING_DIR_HOST}/qt2
+       install -d ${STAGING_DIR_HOST}/qt2/lib
+       oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib
        rm -f include/qxt.h
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-       cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-       cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+       install -d ${STAGING_DIR_HOST}/qt2/include
+       cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+       cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
 }
 
 do_install() {

diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb
index 9210d85..8403528 100644 (file)
--- a/packages/qte/qte-mt-static_2.3.12.bb
+++ b/packages/qte/qte-mt-static_2.3.12.bb
@@ -6,14 +6,14 @@ DEFAULT_PREFERENCE = "-1"
 EXTRA_OECONF += "-static -thread"
 
 do_stage() {
-       rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-       oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+       rm -rf ${STAGING_DIR_HOST}/qt2
+       install -d ${STAGING_DIR_HOST}/qt2/lib
+       oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib
        rm -f include/qxt.h
-       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-       cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-       cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
-       install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR}/${HOST_SYS}/qt2/include/
+       install -d ${STAGING_DIR_HOST}/qt2/include
+       cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+       cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
+       install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR_HOST}/qt2/include/
 }
 
 do_install() {