summaryrefslogtreecommitdiff
path: root/packages/kdepimpi
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-30 13:40:12 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-30 13:40:12 +0000
commit5499676d2eb7ddaaad8ff5fd0c38b66665ed1aba (patch)
treecc25500f56f333de18b67598c316f50b0b2d8cb8 /packages/kdepimpi
parent17db046acbc13634a1b1135d2cb4a192dc9329bf (diff)
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
Diffstat (limited to 'packages/kdepimpi')
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc10
-rw-r--r--packages/kdepimpi/kdepimpi_2.1.4.bb4
-rw-r--r--packages/kdepimpi/pwmpi.inc5
-rw-r--r--packages/kdepimpi/pwmpi_2.1.4.bb4
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