4 files changed, 18 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
 }
 
diff --git a/packages/kdepimpi/kdepimpi_2.1.4.bb b/packages/kdepimpi/kdepimpi_2.1.4.bb
index e69de29bb2..47aafd653f 100644
--- a/packages/kdepimpi/kdepimpi_2.1.4.bb
+++ b/packages/kdepimpi/kdepimpi_2.1.4.bb
@@ -0,0 +1,4 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
+PR="r1"
+
+include kdepimpi-base.inc
diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc
index 0862583bdc..0123e6398b 100644
--- a/packages/kdepimpi/pwmpi.inc
+++ b/packages/kdepimpi/pwmpi.inc
@@ -10,6 +10,11 @@ SUBDIRS="pwmanager/libcrypt/mpi  \
         "
 export OE_QMAKE_LINK="${CXX}"
 
+EXTRA_QMAKEVARS_POST += " \
+INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \
+LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \
+"
+
 do_stage() {
 }
 
diff --git a/packages/kdepimpi/pwmpi_2.1.4.bb b/packages/kdepimpi/pwmpi_2.1.4.bb
index e69de29bb2..257e66b668 100644
--- a/packages/kdepimpi/pwmpi_2.1.4.bb
+++ b/packages/kdepimpi/pwmpi_2.1.4.bb
@@ -0,0 +1,4 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
+PR="r1"
+
+include pwmpi.inc