From: Koen Kooi <koen@openembedded.org>
Date: Mon, 14 Jul 2008 08:53:47 +0000 (+0000)
Subject: qmake2 sdk: fix packaging
X-Git-Tag: Release-2010-05/1~6543^2~7^2~32^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbe0e23252792444bca8562ca88a3c14bffe2b6c;p=openembedded.git

qmake2 sdk: fix packaging
---

diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index 55b402655e..f7bdd7836b 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -17,7 +17,7 @@ S = "${WORKDIR}/${QTVER}"
 
 # we need the real target system here
 CROSS_SYS := "${TARGET_SYS}"
-inherit autotools cross 
+inherit autotools  
 
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
@@ -62,6 +62,3 @@ do_stage() {
     cp -PfR mkspecs ${CROSS_DATADIR}/qt4/
 }
 
-do_install() {
-    :
-}
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 07e97c4413..0e1aa2c61e 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -1,3 +1,11 @@
 QTVERSION="4.3.3"
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
 require ${PN}.inc
+
+inherit cross
+
+do_install() {
+    :
+}
+
+
diff --git a/packages/qmake/qmake2-sdk_2.10a.bb b/packages/qmake/qmake2-sdk_2.10a.bb
index 3c00d81cdc..b16159c8d9 100644
--- a/packages/qmake/qmake2-sdk_2.10a.bb
+++ b/packages/qmake/qmake2-sdk_2.10a.bb
@@ -2,3 +2,16 @@ QTVERSION="4.3.3"
 require qmake2-native.inc
 
 inherit sdk
+
+do_install () {
+	install -d ${D}/${bindir}
+    install -m 0755 bin/qmake ${D}/${bindir}/qmake2
+    install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4
+    install -d ${D}/${datadir}/qt4
+    cp -PfR mkspecs ${D}/${datadir}/qt4/
+}
+
+
+
+
+