[oe-commits] Paul Eggleton : opie-ftplib: remove legacy staging

[git version control]

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

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

opie-ftplib: remove legacy staging

Library is now installed into standard libdir. Also remove unnecessary
PROVIDES.

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

---

 recipes/opie-ftplib/opie-ftplib.inc      |   10 +++-------
 recipes/opie-ftplib/opie-ftplib_1.2.5.bb |    2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/recipes/opie-ftplib/opie-ftplib.inc b/recipes/opie-ftplib/opie-ftplib.inc
index 1d633ca..51a0fed 100644
--- a/recipes/opie-ftplib/opie-ftplib.inc
+++ b/recipes/opie-ftplib/opie-ftplib.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Opie FTP Library"
 SECTION = "opie/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PROVIDES = "libftplib1"
 I18N_FILES = "libftplib.ts"
 APPNAME = "opie-ftplib"
 
@@ -10,11 +9,8 @@ S = "${WORKDIR}/ftplib"
 
 inherit opie
 
-do_stage () {
-	install -m 0664 ${S}/ftplib.h ${STAGING_INCDIR}/
-	oe_libinstall -so libftplib ${STAGING_LIBDIR}
-}
-
 do_install() {
-	oe_libinstall -so libftplib ${D}${palmtopdir}/lib
+    oe_libinstall -so libftplib ${D}${libdir}
+    install -d ${D}${includedir}
+    install -m 0664 ${S}/ftplib.h ${D}${includedir}
 }
diff --git a/recipes/opie-ftplib/opie-ftplib_1.2.5.bb b/recipes/opie-ftplib/opie-ftplib_1.2.5.bb
index 7b58016..1b985d1 100644
--- a/recipes/opie-ftplib/opie-ftplib_1.2.5.bb
+++ b/recipes/opie-ftplib/opie-ftplib_1.2.5.bb
@@ -3,3 +3,5 @@ require ${PN}.inc
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_noncore_net_ftplib.tar.bz2;name=split_noncore_net_ftplib"
 SRC_URI[split_noncore_net_ftplib.md5sum] = "ce39fe4b549eb3a1608a6906b97ffcdd"
 SRC_URI[split_noncore_net_ftplib.sha256sum] = "050a973ceac5e1ca8e295fd5ec8321b6002d80a8a4ee5369b62c3c20940a84c8"
+
+PR = "r1"