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

[git version control]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jun  4 15:47:14 2011 +0100

libmailwrapper: remove legacy staging

Library is now installed into standard libdir.

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

---

 recipes/libmailwrapper/libmailwrapper.inc      |   20 +++++++-------------
 recipes/libmailwrapper/libmailwrapper_1.2.5.bb |    2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/recipes/libmailwrapper/libmailwrapper.inc b/recipes/libmailwrapper/libmailwrapper.inc
index d88ad46..c72ae36 100644
--- a/recipes/libmailwrapper/libmailwrapper.inc
+++ b/recipes/libmailwrapper/libmailwrapper.inc
@@ -8,18 +8,12 @@ S = "${WORKDIR}/libmailwrapper"
 
 inherit opie
 
-do_stage () {
-	install -d ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/maildefines.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/settings.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/statusmail.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/abstractmail.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/mailtypes.h ${STAGING_INCDIR}/libmailwrapper/
-	oe_libinstall -so libmailwrapper ${STAGING_LIBDIR}
-}
-
 do_install() {
-	oe_libinstall -so libmailwrapper ${D}${palmtopdir}/lib
+    oe_libinstall -so libmailwrapper ${D}${libdir}
+    install -d ${D}${includedir}/libmailwrapper/
+    install -m 0664 ${S}/maildefines.h ${D}${includedir}/libmailwrapper/
+    install -m 0664 ${S}/settings.h ${D}${includedir}/libmailwrapper/
+    install -m 0664 ${S}/statusmail.h ${D}${includedir}/libmailwrapper/
+    install -m 0664 ${S}/abstractmail.h ${D}${includedir}/libmailwrapper/
+    install -m 0664 ${S}/mailtypes.h ${D}${includedir}/libmailwrapper/
 }
-
-FILES_${PN} = "${palmtopdir}/lib/lib*.so.*"
diff --git a/recipes/libmailwrapper/libmailwrapper_1.2.5.bb b/recipes/libmailwrapper/libmailwrapper_1.2.5.bb
index b52267f..0ebdc39 100644
--- a/recipes/libmailwrapper/libmailwrapper_1.2.5.bb
+++ b/recipes/libmailwrapper/libmailwrapper_1.2.5.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_noncore_net_mail_libmailwrapper.tar.bz2;name=split_noncore_net_mail_libmailwrapper"
 SRC_URI[split_noncore_net_mail_libmailwrapper.md5sum] = "3d155efe75838caf4c957dc3de677d41"