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

diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index b77043d..3fa8781 100644 (file)
--- 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 e69de29..47aafd6 100644 (file)
--- 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 0862583..0123e63 100644 (file)
--- 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 e69de29..257e66b 100644 (file)
--- 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