Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/30 14:41:28+02:00 local!hrw
kdepimpi: stage own things in own dirs so knights will build - closed #18

BKrev: 429b17bcWnlXnWNXo51MV_xy396Vzw

1 files changed, 5 insertions, 5 deletions

diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index b77043d315..3fa8781658 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -85,12 +85,12 @@ do_unstage() {
 
 	for dir in ${HEADERS_DIRS};
 	do
-		rm -rf ${STAGING_INCDIR}/$dir
+		rm -rf ${STAGING_INCDIR}/kdepimpi/$dir
 	done
 
     for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
     do
-        rm -f ${STAGING_LIBDIR}/$f*
+        rm -f ${STAGING_LIBDIR}/kdepimpi/$f*
     done
 }
 
@@ -100,13 +100,13 @@ do_stage() {
 
 	for dir in ${HEADERS_DIRS};
 	do
-		install -d ${STAGING_INCDIR}/$dir
-		install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/$dir/
+		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}
+        oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
     done
 }