diff options
author | John Lee <john_lee@openmoko.org> | 2008-02-29 10:18:28 +0000 |
---|---|---|
committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2008-02-29 10:18:28 +0000 |
commit | 022ac4bfbd6d85f4accbd23f18138a10b2e9f0de (patch) | |
tree | 1a6d1e12611c2b3a341f3293af95c8575edc3c4e /packages/qt | |
parent | fe6f8c336429aa31e9b3a74ecd9f1e8a320a8a07 (diff) | |
parent | 1e4b78b265763e2b2d0d430f62b86aab5826a48e (diff) |
merge of 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
and 'e1563879f370dd02713e036ee932bb571cce4bc4'
Diffstat (limited to 'packages/qt')
-rw-r--r-- | packages/qt/qt-x11-free-common.inc | 2 | ||||
-rw-r--r-- | packages/qt/qt-x11-free-native_3.3.5.bb | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc index a68575d601..745c7fab3c 100644 --- 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 2ed3da49b5..f23d874648 100644 --- 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 } |