diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-10-02 11:27:36 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-02 11:27:36 +0000 |
| commit | d5f8d512871d4a702261a5f479f444d4ea9ef875 (patch) | |
| tree | 866723584682efdb5d89d38953f584e10043af83 /packages/qmake | |
| parent | 5409a0e65ec89118622d9c8b85ae81bd4eeea01d (diff) | |
| download | openembedded-d5f8d512871d4a702261a5f479f444d4ea9ef875.tar.gz | |
qmake2: fix path issues
Diffstat (limited to 'packages/qmake')
| -rw-r--r-- | packages/qmake/qmake2-native.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index 642adf874a..b2ffce4f48 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -18,7 +18,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ S = "${WORKDIR}/${QTVER}" # we need the real target system here -CROSS_SYS := "${TARGET_SYS}" +CROSS_SYS := "${MULTIMACH_TARGET_SYS}" + inherit autotools export QTDIR = "${S}" @@ -53,7 +54,7 @@ do_configure() { export OE_QMAKE_RCC="non-existant" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," - echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" + echo yes | ./configure -prefix ${STAGING_DIR_TARGET}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" } do_compile() { @@ -61,8 +62,10 @@ do_compile() { } do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4 + install -d ${CROSS_DATADIR}/qt4 cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ } |