[oe-commits] Paul Eggleton : qte: remove legacy staging

[git version control]

Module: openembedded.git
Branch: master
Commit: c2c3e2ed9d3a7ee2671a7c7ab140054d92090c4b
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=c2c3e2ed9d3a7ee2671a7c7ab140054d92090c4b

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sun Jun  5 22:23:37 2011 +0100

qte: remove legacy staging

Removes legacy staging from QtE 2.3.10. Includes & libraries are now no
longer staged in a special location - they are as they would be installed
on the target system (/usr/include/qte and /usr/lib respectively).
qmake.bbclass has been updated to reflect this.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 classes/qmake.bbclass             |    4 ++--
 recipes/qte/qte-common_2.3.10.inc |   11 +----------
 recipes/qte/qte-mt_2.3.10.bb      |    2 +-
 recipes/qte/qte_2.3.10.bb         |    2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass
index 7dfe459..40fc739 100644
--- a/classes/qmake.bbclass
+++ b/classes/qmake.bbclass
@@ -8,8 +8,8 @@ export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
 export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
 export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
 export OE_QMAKE_LINK="${CCLD}"
-export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT="qte"
 export OE_QMAKE_LIBS_X11=""
 
diff --git a/recipes/qte/qte-common_2.3.10.inc b/recipes/qte/qte-common_2.3.10.inc
index 40b8446..75419ac 100644
--- a/recipes/qte/qte-common_2.3.10.inc
+++ b/recipes/qte/qte-common_2.3.10.inc
@@ -136,20 +136,11 @@ do_compile() {
 	oe_runmake src-mt sub-src
 }
 
-do_stage() {
-	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}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
-	cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
-}
-
 do_install() {
 	oe_libinstall -so -C lib lib${PN} ${D}${libdir}
 
 	install -d ${D}/${includedir}/qte
+	rm -f include/qxt.h
 	install -m 0644 include/*.h ${D}/${includedir}/qte/
 }
 
diff --git a/recipes/qte/qte-mt_2.3.10.bb b/recipes/qte/qte-mt_2.3.10.bb
index 58bb7c8..84467f5 100644
--- a/recipes/qte/qte-mt_2.3.10.bb
+++ b/recipes/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r30"
+PR = "r31"
 
 EXTRA_OECONF += "-thread"
 
diff --git a/recipes/qte/qte_2.3.10.bb b/recipes/qte/qte_2.3.10.bb
index 88bc07f..7a4376d 100644
--- a/recipes/qte/qte_2.3.10.bb
+++ b/recipes/qte/qte_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r55"
+PR = "r56"
 
 
 SRC_URI[md5sum] = "1f7ad30113afc500cab7f5b2f4dec0d7"