kdepimpi: remove legacy staging

Also remove comments from multi-line strings.

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

1 files changed, 6 insertions, 29 deletions

diff --git a/recipes-qtopia/kdepimpi/kdepimpi-qte.inc b/recipes-qtopia/kdepimpi/kdepimpi-qte.inc
index da7f011..07f2903 100644
--- a/recipes-qtopia/kdepimpi/kdepimpi-qte.inc
+++ b/recipes-qtopia/kdepimpi/kdepimpi-qte.inc
@@ -81,35 +81,6 @@ kabc \
 libkcal \
 libkdepim "
 
-do_unstage() {
-
-	for dir in ${HEADERS_DIRS};
-	do
-		rm -rf ${STAGING_INCDIR}/kdepimpi/$dir
-	done
-
-    for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
-    do
-        rm -f ${STAGING_LIBDIR}/kdepimpi/$f*
-    done
-}
-
-addtask unstage before do_configure
-
-do_stage() {
-
-	for dir in ${HEADERS_DIRS};
-	do
-		install -d ${STAGING_INCDIR}/kdepimpi/$dir
-		install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/
-	done
-
-    for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
-    do
-        oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
-    done
-}
-
 do_install() {
     install -d ${D}${palmtopdir}/bin \
                ${D}${palmtopdir}/lib \
@@ -137,6 +108,12 @@ do_install() {
         oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
     done
 
+    for dir in ${HEADERS_DIRS};
+    do
+        install -d ${D}${includedir}/kdepimpi/$dir
+        install -m 0644 ${S}/$dir/*.h ${D}${includedir}/kdepimpi/$dir/
+    done
+
     install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
     install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi