diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-07 14:28:15 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-07 14:28:15 +0000 |
| commit | 6d7f3cbcb7167a472bc7a982b600bdfb58f8057f (patch) | |
| tree | b43d081b60f8cde466ea2c4da442b5809c25ce1d | |
| parent | fc50fe5f2dbe58546fa80423186b27ab1bf7c4de (diff) | |
| download | poky-6d7f3cbcb7167a472bc7a982b600bdfb58f8057f.tar.gz | |
qmake2-cross: Fix the driectory the qmake binaries are installed into
| -rw-r--r-- | meta/packages/qmake/qmake2-cross_2.10a.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/packages/qmake/qmake2-cross_2.10a.bb b/meta/packages/qmake/qmake2-cross_2.10a.bb index 99fe90722a..5f1c020bce 100644 --- a/meta/packages/qmake/qmake2-cross_2.10a.bb +++ b/meta/packages/qmake/qmake2-cross_2.10a.bb | |||
| @@ -15,6 +15,7 @@ S = "${WORKDIR}/${QTVER}" | |||
| 15 | 15 | ||
| 16 | # we need the real target system here | 16 | # we need the real target system here |
| 17 | CROSS_SYS := "${TARGET_SYS}" | 17 | CROSS_SYS := "${TARGET_SYS}" |
| 18 | CROSS_BINDIR := "${STAGING_BINDIR_CROSS}" | ||
| 18 | inherit autotools cross | 19 | inherit autotools cross |
| 19 | 20 | ||
| 20 | export QTDIR = "${S}" | 21 | export QTDIR = "${S}" |
| @@ -54,8 +55,9 @@ do_compile() { | |||
| 54 | } | 55 | } |
| 55 | 56 | ||
| 56 | do_stage() { | 57 | do_stage() { |
| 57 | install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 | 58 | install -d ${CROSS_BINDIR}/ |
| 58 | install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 | 59 | install -m 0755 bin/qmake ${CROSS_BINDIR}/qmake2 |
| 60 | install -m 0755 bin/qmake ${CROSS_BINDIR}/qmake-qt4 | ||
| 59 | install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ | 61 | install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ |
| 60 | cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ | 62 | cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ |
| 61 | install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ | 63 | install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ |
