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

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

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

1 files changed, 27 insertions, 27 deletions

diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index 8c22a6075b..adc869b61f 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -69,42 +69,42 @@ do_configure_prepend() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/bin \
-               ${D}/${palmtopdir}/lib \
-               ${D}/${palmtopdir}/apps/1Pim \
-               ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 \
-               ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini \
-               ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
-               ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
-               ${D}/${palmtopdir}/plugins/applets
-
-    install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/
-    install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/
-    install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}/${palmtopdir}/pics/kdepim/korganizer
-    install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16
-    install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini
-    install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop
-
-    install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}/${palmtopdir}/pics/kdepim/kaddressbook
-    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16
-    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22
-    install -m 0644 kaddressbook/kaddressbook.desktop ${D}/${palmtopdir}/apps/1Pim/kaddressbook.desktop
+    install -d ${D}${palmtopdir}/bin \
+               ${D}${palmtopdir}/lib \
+               ${D}${palmtopdir}/apps/1Pim \
+               ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
+               ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \
+               ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
+               ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
+               ${D}${palmtopdir}/plugins/applets
+
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/
+    install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}${palmtopdir}/pics/kdepim/korganizer
+    install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/icons16
+    install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini
+    install -m 0644 korganizer/korganizer.desktop ${D}${palmtopdir}/apps/1Pim/korganizer.desktop
+
+    install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}${palmtopdir}/pics/kdepim/kaddressbook
+    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16
+    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22
+    install -m 0644 kaddressbook/kaddressbook.desktop ${D}${palmtopdir}/apps/1Pim/kaddressbook.desktop
 
     for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia 
     do
-        oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/lib
+        oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
     done
 
-    install -m 0755 ${S}/dest/kopi ${D}/${palmtopdir}/bin/kopi
-    install -m 0755 ${S}/dest/kapi ${D}/${palmtopdir}/bin/kapi
+    install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
+    install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
     
-    install -d ${D}/${bindir} ${D}/${libdir}
-    install -m 0755 ${S}/dest/kammu ${D}/${bindir}/kammu
-    oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}/${libdir}
+    install -d ${D}${bindir} ${D}${libdir}
+    install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
+    oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
 
     for f in libkopialarmapplet
     do
-        oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/plugins/applets
+        oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets
     done
 }