Merge

2004/04/19 14:02:59-05:00 ti.com!a0868066
Merges.

2004/04/19 14:00:46-05:00 ti.com!a0868066
Killing usage of {} expansion, which isnt supported by the ash shell.

BKrev: 408494e2t24Aqbe2prpXURtnZlhCmA

40 files changed, 380 insertions, 176 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 6ce20501a5..180a46ab0f 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,3 +1,4 @@
+a0868066@lta0868066.ent.ti.com
 erich@erichl.mine.nu
 erich@erichv.mine.nu
 gbritton@doomcom.org
diff --git a/aliens/aliens_1.0.0.oe b/aliens/aliens_1.0.0.oe
index 14a39b1b30..14be69a031 100644
--- a/aliens/aliens_1.0.0.oe
+++ b/aliens/aliens_1.0.0.oe
@@ -17,7 +17,10 @@ do_compile_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics,share/aliens}
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/pics \
+        	   ${D}/${palmtopdir}/apps/Games \
+        	   ${D}/${palmtopdir}/share/aliens
         install -D -m 0755 aliens ${D}${palmtopdir}/bin/aliens
 	install -D -m 0644 aliens.png ${D}${palmtopdir}/pics/aliens.png
         install -D -m 0644 aliens.desktop ${D}${palmtopdir}/Games/aliens.desktop
diff --git a/billiardz/billiardz_0.1.4.oe b/billiardz/billiardz_0.1.4.oe
index caa3850813..59c687449a 100644
--- a/billiardz/billiardz_0.1.4.oe
+++ b/billiardz/billiardz_0.1.4.oe
@@ -14,15 +14,17 @@ QMAKE_PROFILES = "billiardz.arm.pro"
 EXTRA_QMAKEVARS_POST = "DEFINES-=FPM_INTEL" 
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics/billiardz}
-        install -D -m 0755 ${PN} ${D}${palmtopdir}/bin/${PN}
-        install -D -m 0644 ${PN}.png ${D}${palmtopdir}/pics/${PN}.png
-	cp -a images/*.png ${D}${palmtopdir}/pics/billiardz
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Games,pics/billiardz \
+		   ${D}/${palmtopdir}/pics/billiardz
+        install -D -m 0755 billiardz ${D}/${palmtopdir}/bin/billiardz
+        install -D -m 0644 billiardz.png ${D}/${palmtopdir}/pics/billiardz.png
+	cp -a images/*.png ${D}/${palmtopdir}/pics/billiardz
 
-	echo "[Desktop Entry] " >${D}${palmtopdir}/Games/billiardz.desktop
-	echo "Comment=Billiards for Zaurus" >>${D}${palmtopdir}/Games/billiardz.desktop
-	echo "Exec=billiardz" >>${D}${palmtopdir}/Games/billiardz.desktop
-	echo "Icon=billiardz" >>${D}${palmtopdir}/Games/billiardz.desktop
-	echo "Type=Application" >>${D}${palmtopdir}/Games/billiardz.desktop
-	echo "Name=BilliardZ" >>${D}${palmtopdir}/Games/billiardz.desktop
+	echo "[Desktop Entry] " >${D}/${palmtopdir}/Games/billiardz.desktop
+	echo "Comment=Billiards for Zaurus" >>${D}/${palmtopdir}/Games/billiardz.desktop
+	echo "Exec=billiardz" >>${D}/${palmtopdir}/Games/billiardz.desktop
+	echo "Icon=billiardz" >>${D}/${palmtopdir}/Games/billiardz.desktop
+	echo "Type=Application" >>${D}/${palmtopdir}/Games/billiardz.desktop
+	echo "Name=BilliardZ" >>${D}/${palmtopdir}/Games/billiardz.desktop
 }
diff --git a/brickout/brickout_2002.06.09.oe b/brickout/brickout_2002.06.09.oe
index 82952b0d73..fe7f573ced 100644
--- a/brickout/brickout_2002.06.09.oe
+++ b/brickout/brickout_2002.06.09.oe
@@ -17,18 +17,23 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics,share/brickout/{sounds,music,images}}
-        install -D -m 0755 brickout ${D}${palmtopdir}/bin/brickout
-	install -D -m 0644 brickout.png ${D}${palmtopdir}/pics/brickout.png
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Games \
+		   ${D}/${palmtopdir}/pics \
+		   ${D}/${palmtopdir}/share/brickout/sounds \
+		   ${D}/${palmtopdir}/share/brickout/music \
+		   ${D}/${palmtopdir}/share/brickout/images
+        install -D -m 0755 brickout ${D}/${palmtopdir}/bin/brickout
+	install -D -m 0644 brickout.png ${D}/${palmtopdir}/pics/brickout.png
 
-        cp -a sounds/* ${D}${palmtopdir}/share/brickout/sounds/
-        cp -a music/* ${D}${palmtopdir}/share/brickout/music/
-        cp -a images-sdl/* ${D}${palmtopdir}/share/brickout/images/
+        cp -a sounds/* ${D}/${palmtopdir}/share/brickout/sounds/
+        cp -a music/* ${D}/${palmtopdir}/share/brickout/music/
+        cp -a images-sdl/* ${D}/${palmtopdir}/share/brickout/images/
 
-	echo "[Desktop Entry]" >${D}${palmtopdir}/Games/brickout.desktop
-	echo "Comment=Arkanoid game" >>${D}${palmtopdir}/Games/brickout.desktop
-	echo "Exec=brickout" >>${D}${palmtopdir}/Games/brickout.desktop
-	echo "Icon=brickout" >>${D}${palmtopdir}/Games/brickout.desktop
-	echo "Type=Application" >>${D}${palmtopdir}/Games/brickout.desktop
-	echo "Name=Brickout" >>${D}${palmtopdir}/Games/brickout.desktop
+	echo "[Desktop Entry]" >${D}/${palmtopdir}/Games/brickout.desktop
+	echo "Comment=Arkanoid game" >>${D}/${palmtopdir}/Games/brickout.desktop
+	echo "Exec=brickout" >>${D}/${palmtopdir}/Games/brickout.desktop
+	echo "Icon=brickout" >>${D}/${palmtopdir}/Games/brickout.desktop
+	echo "Type=Application" >>${D}/${palmtopdir}/Games/brickout.desktop
+	echo "Name=Brickout" >>${D}/${palmtopdir}/Games/brickout.desktop
 }
diff --git a/cumulus/cumulus_1.1.oe b/cumulus/cumulus_1.1.oe
index fddf1aaeaa..e63cb9a756 100644
--- a/cumulus/cumulus_1.1.oe
+++ b/cumulus/cumulus_1.1.oe
@@ -18,10 +18,12 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-        install -D -m 0755 cumulus/cumulus ${D}${palmtopdir}/bin/cumulus
-        install -D -m 0644 cumulus/cumulus.desktop ${D}${palmtopdir}/Applications/cumulus.desktop
-        install -D -m 0644 cumulus.png ${D}${palmtopdir}/pics/cumulus.png
-        install -d ${D}${palmtopdir}/pics/mapicons
-        cp -a cumulus/map-icons/* ${D}${palmtopdir}/pics/mapicons
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/pics
+        install -D -m 0755 cumulus/cumulus ${D}/${palmtopdir}/bin/cumulus
+        install -D -m 0644 cumulus/cumulus.desktop ${D}/${palmtopdir}/Applications/cumulus.desktop
+        install -D -m 0644 cumulus.png ${D}/${palmtopdir}/pics/cumulus.png
+        install -d ${D}/${palmtopdir}/pics/mapicons
+        cp -a cumulus/map-icons/* ${D}/${palmtopdir}/pics/mapicons
 }
diff --git a/dviviewer/dviviewer_1.0.1.oe b/dviviewer/dviviewer_1.0.1.oe
index b806fd548a..95f7d964e9 100644
--- a/dviviewer/dviviewer_1.0.1.oe
+++ b/dviviewer/dviviewer_1.0.1.oe
@@ -10,9 +10,11 @@ S = "${WORKDIR}/dviviewer"
 inherit palmtop
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-        install -D -m 755 dviviewer ${D}${palmtopdir}/bin/dviviewer
-        install -D -m 644 dviviewer.desktop ${D}${palmtopdir}/Applications/dviviewer.desktop
-        install -d ${D}${palmtopdir}/pics
-        cp -a *.png ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/pics
+        install -D -m 755 dviviewer ${D}/${palmtopdir}/bin/dviviewer
+        install -D -m 644 dviviewer.desktop ${D}/${palmtopdir}/Applications/dviviewer.desktop
+        install -d ${D}/${palmtopdir}/pics
+        cp -a *.png ${D}/${palmtopdir}/pics/
 }
diff --git a/freedroid/freedroid_1.0.2.oe b/freedroid/freedroid_1.0.2.oe
index 315adf7c4b..a8eb4409bf 100644
--- a/freedroid/freedroid_1.0.2.oe
+++ b/freedroid/freedroid_1.0.2.oe
@@ -14,20 +14,25 @@ do_compile() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics,share/freedroid/{graphics,map,sound}}
-        install -D -m 0755 src/freedroid ${D}${palmtopdir}/bin/freedroid
-	install -D -m 0644 ${FILESDIR}/icon.png ${D}${palmtopdir}/pics/freedroid.png
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Games \
+		   ${D}/${palmtopdir}/pics \
+		   ${D}/${palmtopdir}/share/freedroid/graphics \
+		   ${D}/${palmtopdir}/share/freedroid/map \
+		   ${D}/${palmtopdir}/share/freedroid/sound
+        install -D -m 0755 src/freedroid ${D}/${palmtopdir}/bin/freedroid
+	install -D -m 0644 ${FILESDIR}/icon.png ${D}/${palmtopdir}/pics/freedroid.png
 
-	cp -a graphics/* ${D}${palmtopdir}/share/freedroid/graphics
-	cp -a map/* ${D}${palmtopdir}/share/freedroid/map
-	cp -a sound/* ${D}${palmtopdir}/share/freedroid/sound
+	cp -a graphics/* ${D}/${palmtopdir}/share/freedroid/graphics
+	cp -a map/* ${D}/${palmtopdir}/share/freedroid/map
+	cp -a sound/* ${D}/${palmtopdir}/share/freedroid/sound
 
-	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/freedroid.desktop
-	echo "Comment=A Paradroid Clone" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
-	echo "Exec=freedroid" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
-	echo "Icon=freedroid" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
-	echo "Type=Application" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
-	echo "Name=Freedroid" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
+	echo "[Desktop Entry]" >${D}/${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Comment=A Paradroid Clone" >>${D}/${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Exec=freedroid" >>${D}/${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Icon=freedroid" >>${D}/${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Type=Application" >>${D}/${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Name=Freedroid" >>${D}/${palmtopdir}/apps/Games/freedroid.desktop
 }
 
 FILES_${PN} = ""
diff --git a/gemdropx/gemdropx_0.9.oe b/gemdropx/gemdropx_0.9.oe
index ea19100a26..f784c1f816 100644
--- a/gemdropx/gemdropx_0.9.oe
+++ b/gemdropx/gemdropx_0.9.oe
@@ -17,15 +17,18 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics,share/gemdropx}
-        install -D -m 0755 gemdropx ${D}${palmtopdir}/bin/gemdropx
-	install -D -m 0644 ${FILESDIR}/icon.png ${D}${palmtopdir}/pics/gemdropx.png
-	cp -a data/* ${D}${palmtopdir}/share/gemdropx
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Games \
+		   ${D}/${palmtopdir}/pics \
+		   ${D}/${palmtopdir}/share/gemdropx
+        install -D -m 0755 gemdropx ${D}/${palmtopdir}/bin/gemdropx
+	install -D -m 0644 ${FILESDIR}/icon.png ${D}/${palmtopdir}/pics/gemdropx.png
+	cp -a data/* ${D}/${palmtopdir}/share/gemdropx
 
-	echo "[Desktop Entry]" >${D}${palmtopdir}/Games/gemdropx.desktop
-	echo "Comment=Puzzle game" >>${D}${palmtopdir}/Games/gemdropx.desktop
-	echo "Exec=gemdropx" >>${D}${palmtopdir}/Games/gemdropx.desktop
-	echo "Icon=gemdropx" >>${D}${palmtopdir}/Games/gemdropx.desktop
-	echo "Type=Application" >>${D}${palmtopdir}/Games/gemdropx.desktop
-	echo "Name=GemdropX" >>${D}${palmtopdir}/Games/gemdropx.desktop
+	echo "[Desktop Entry]" >${D}/${palmtopdir}/Games/gemdropx.desktop
+	echo "Comment=Puzzle game" >>${D}/${palmtopdir}/Games/gemdropx.desktop
+	echo "Exec=gemdropx" >>${D}/${palmtopdir}/Games/gemdropx.desktop
+	echo "Icon=gemdropx" >>${D}/${palmtopdir}/Games/gemdropx.desktop
+	echo "Type=Application" >>${D}/${palmtopdir}/Games/gemdropx.desktop
+	echo "Name=GemdropX" >>${D}/${palmtopdir}/Games/gemdropx.desktop
 }
diff --git a/hostap/hostap-modules_0.1.3.oe b/hostap/hostap-modules_0.1.3.oe
index 8666d610dd..d7fbd0ae92 100644
--- a/hostap/hostap-modules_0.1.3.oe
+++ b/hostap/hostap-modules_0.1.3.oe
@@ -12,8 +12,9 @@ inherit module
 MAKE_TARGETS = "hostap pccard"
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/{net,pcmcia}
-        install -d ${D}/${sysconfdir}/pcmcia
+	install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
+		   ${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}/${sysconfdir}/pcmcia
 	install -m 0755 driver/modules/hostap_crypt_wep.o ${D}/lib/modules/${KERNEL_VERSION}/net/
 	install -m 0755 driver/modules/hostap.o ${D}/lib/modules/${KERNEL_VERSION}/net/
 	install -m 0755 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
diff --git a/hostap/hostap-modules_0.2.0.oe b/hostap/hostap-modules_0.2.0.oe
index 8666d610dd..d7fbd0ae92 100644
--- a/hostap/hostap-modules_0.2.0.oe
+++ b/hostap/hostap-modules_0.2.0.oe
@@ -12,8 +12,9 @@ inherit module
 MAKE_TARGETS = "hostap pccard"
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/{net,pcmcia}
-        install -d ${D}/${sysconfdir}/pcmcia
+	install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
+		   ${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}/${sysconfdir}/pcmcia
 	install -m 0755 driver/modules/hostap_crypt_wep.o ${D}/lib/modules/${KERNEL_VERSION}/net/
 	install -m 0755 driver/modules/hostap.o ${D}/lib/modules/${KERNEL_VERSION}/net/
 	install -m 0755 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
diff --git a/iqnotes/iqnotes_2.0.2.oe b/iqnotes/iqnotes_2.0.2.oe
index ac9c77cdaf..4552adc65a 100644
--- a/iqnotes/iqnotes_2.0.2.oe
+++ b/iqnotes/iqnotes_2.0.2.oe
@@ -15,10 +15,14 @@ inherit palmtop
 QMAKE_PROFILES = "iqnotes.pro"
 
 do_install() {
-        install -d ${D}${palmtopdir}/{help/html/,bin,apps/Applications,pics/iqnotes/items,iqnotes/icons}
-        install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/
-        install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/
-        install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/
-        install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/
-        install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/help/html \
+		   ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/pics/iqnotes/items \
+		   ${D}/${palmtopdir}/iqnotes/icons
+        install -m 0755 ${S}/../bin/iqnotes ${D}/${palmtopdir}/bin/
+        install -m 0644 ${S}/../apps/Applications/*.desktop ${D}/${palmtopdir}/apps/Applications/
+        install -m 0644 ${S}/../pics/iqnotes/*.png ${D}/${palmtopdir}/pics/iqnotes/
+        install -m 0644 ${S}/../help/html/iqnotes.html ${D}/${palmtopdir}/help/html/
+        install -m 0644 ${S}/../pics/*.xpm ${D}/${palmtopdir}/pics/
 }
diff --git a/justreader/justreader_2.0k.oe b/justreader/justreader_2.0k.oe
index e69de29bb2..812ffa6e8d 100644
--- a/justreader/justreader_2.0k.oe
+++ b/justreader/justreader_2.0k.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "An E-Books reader for Qt/Embedded based Palmtop Environments"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/justreader/justreader_${PV}.tgz"
+S = "${WORKDIR}/TextReader2"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = 'INCLUDEPATH+="${STAGING_INCDIR}/qpe" LIBS+=-lqpe'
+
+do_configure_prepend() {
+	find . -name "Makefile"|xargs rm -f
+}
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/pics \
+		   ${D}/${palmtopdir}/apps/Applications
+	cp -dfR apps bin pics ${D}/${palmtopdir}/
+}
diff --git a/knights/knights_1.14.oe b/knights/knights_1.14.oe
index 8f3d854b51..28cc87fa6b 100644
--- a/knights/knights_1.14.oe
+++ b/knights/knights_1.14.oe
@@ -20,9 +20,11 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics}
-        install -D -m 755 knights/knights ${D}${palmtopdir}/bin/knights
-        install -D -m 644 knights.desktop ${D}${palmtopdir}/Games/knights.desktop
-        install -d ${D}${palmtopdir}/pics
-        cp -a pics/knights ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/bin \
+	           ${D}/${palmtopdir}/apps/Games \
+       	 	   ${D}/${palmtopdir}/pics
+        install -D -m 755 knights/knights ${D}/${palmtopdir}/bin/knights
+        install -D -m 644 knights.desktop ${D}/${palmtopdir}/Games/knights.desktop
+        install -d ${D}/${palmtopdir}/pics
+        cp -a pics/knights ${D}/${palmtopdir}/pics/
 }
diff --git a/korganizer/korganizer-embedded_1.5.0.oe b/korganizer/korganizer-embedded_1.5.0.oe
index 139b20c3fb..ff81c311dc 100644
--- a/korganizer/korganizer-embedded_1.5.0.oe
+++ b/korganizer/korganizer-embedded_1.5.0.oe
@@ -25,7 +25,10 @@ do_configure_prepend() {
 }
 
 do_install() {
-    install -d ${D}/opt/QtPalmtop/{bin,lib,apps/Pim,pics/korganizer/icons16}
+    install -d ${D}/${palmtopdir}/bin \
+	       ${D}/${palmtopdir}/lib \
+	       ${D}/${palmtopdir}/apps/Pim \
+       	       ${D}/${palmtopdir}/pics/korganizer/icons16
     install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
     cd ${S}/pics
     cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
diff --git a/korganizer/korganizer-embedded_1.7.0.oe b/korganizer/korganizer-embedded_1.7.0.oe
index e69de29bb2..31ee8d9b60 100644
--- a/korganizer/korganizer-embedded_1.7.0.oe
+++ b/korganizer/korganizer-embedded_1.7.0.oe
@@ -0,0 +1,57 @@
+DESCRIPTION= "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Sebastian Goergen <zeppo@gmx.net>"
+LICENSE = "GPL"
+RDEPENDS = "lipqpe1"
+DEPENDS ="virtual/libc virtual/libqpe"
+PR = "b"
+
+SRC_URI = "http://www.pi-sync.net/daunlood/latest/korganizerPi.170${PR}.tar.gz"
+
+S = "${WORKDIR}/korganizerPi.170${PR}"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link,"
+QMAKE_PROFILES= "all.pro"
+
+SUBDIRS="qtcompat microkde libical/src/libical libical/src/libicalss libkcal libkdepim libkabcwrap kalarmd korganizer " 
+
+do_configure_prepend() {
+        echo -e "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro
+        for d in ${SUBDIRS}
+        do
+                mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+        done
+}
+
+do_install() {
+    install -d ${D}/${palmtopdir}/bin \
+	       ${D}/${palmtopdir}/lib \
+	       ${D}/${palmtopdir}/apps/Pim \
+       	       ${D}/${palmtopdir}/pics/korganizer/icons16 \
+       	       ${D}/${palmtopdir}/pics/korganizer/iconsmini \
+       	       ${D}/${palmtopdir}/plugins/applets
+    install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
+    cd ${S}/pics
+    cp ko*.png ${D}/opt/QtPalmtop/pics
+    cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
+    cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16
+    cp ./iconsmini/*.png ${D}/opt/QtPalmtop/pics/korganizer/iconsmini
+
+    for f in libmicrokde.so.1.0.0 libmicrokdepim.so.1.0.0 libmicrokabc.so.1.0.0 libmicrokcal.so.1.0.0 libmicroqtcompat.so.1.0.0 
+    do
+        oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
+        rm -f ${STAGING_LIBDIR}/${f}
+    done
+
+    install -m 0755 ${STAGING_DIR}/target/bin/kopi ${D}/opt/QtPalmtop/bin/kopi
+    rm -f ${STAGING_DIR}/target/bin/kopi
+    for f in libkopialarmapplet.so.1.0.0 libsimplealarmdaemon.so.1.0.0
+    do
+	oe_soinstall ${STAGING_DIR}/target/plugins/applets/${f} ${D}/opt/QtPalmtop/plugins/applets
+    rm -f $ {STAGING_DIR}/target/plugins/applets/${f}
+    done
+
+}
diff --git a/kstars/kstars-embedded_0.8.5.oe b/kstars/kstars-embedded_0.8.5.oe
index a92c32d6d3..ad5b389bbb 100644
--- a/kstars/kstars-embedded_0.8.5.oe
+++ b/kstars/kstars-embedded_0.8.5.oe
@@ -10,10 +10,13 @@ S = "${WORKDIR}/kstars"
 inherit palmtop
 
 do_install() {
-    install -d ${D}${palmtopdir}/{bin,apps/Applications,pics/kstars,share/apps/kstars}
-    install -m 0755 ${STAGING_LIBDIR}/../bin/kstars ${D}${palmtopdir}/bin/kstars
+    install -d ${D}/${palmtopdir}/bin \
+	       ${D}/${palmtopdir}/apps/Applications \
+	       ${D}/${palmtopdir}/pics/kstars \
+	       ${D}/${palmtopdir}/share/apps/kstars
+    install -m 0755 ${STAGING_LIBDIR}/../bin/kstars ${D}/${palmtopdir}/bin/kstars
     rm -f ${STAGING_LIBDIR}/../bin/kstars
-    install -m 0644 ${WORKDIR}/apps/Applications/kstars.desktop ${D}${palmtopdir}/Applications
-    cp -a ${WORKDIR}/pics/kstars ${D}${palmtopdir}/pics/
-    cp -a ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/
+    install -m 0644 ${WORKDIR}/apps/Applications/kstars.desktop ${D}/${palmtopdir}/Applications
+    cp -a ${WORKDIR}/pics/kstars ${D}/${palmtopdir}/pics/
+    cp -a ${WORKDIR}/share/apps/kstars ${D}/${palmtopdir}/share/apps/
 }
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index e63bbf8fc0..20084a7000 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -19,7 +19,8 @@ PACKAGES = ""
 
 do_stage () {
 	oe_runmake install
-	install -d ${STAGING_DATADIR}/{libtool,aclocal}
+	install -d ${STAGING_DATADIR}/libtool \
+		   ${STAGING_DATADIR}/aclocal
 	install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
 	install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
 	install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index 2e94d5c418..0f90e2034d 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -17,7 +17,8 @@ EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
 
 do_stage () {
         oe_runmake install
-        install -d ${STAGING_DATADIR}/{libtool,aclocal}
+        install -d ${STAGING_DATADIR}/libtool \
+        	   ${STAGING_DATADIR}/aclocal
         install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
         install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
         install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
diff --git a/netbase/netbase_4.16.oe b/netbase/netbase_4.16.oe
index 35b17a7624..7086701064 100644
--- a/netbase/netbase_4.16.oe
+++ b/netbase/netbase_4.16.oe
@@ -5,27 +5,32 @@ infrastructure for basic TCP/IP based networking."
 SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz"
 
 do_install () {
-	install -d ${D}/etc/init.d ${D}/${sbindir} ${D}/${mandir}/man8
-	install -d ${D}/etc/network/{if-pre-up.d,if-up.d}
-	install -m 0644 ${FILESDIR}/options ${D}/etc/network/options
-	install -m 0755 ${FILESDIR}/init ${D}/etc/init.d/networking
-	install -m 0644 etc-rpc ${D}/etc/rpc
-	install -m 0644 etc-protocols ${D}/etc/protocols
-	install -m 0644 etc-services ${D}/etc/services
+	install -d ${D}/${sysconfdir}/init.d \
+		   ${D}/${sbindir} \
+		   ${D}/${mandir}/man8 \
+		   ${D}/${sysconfdir}/network/if-pre-up.d \
+		   ${D}/${sysconfdir}/network/if-up.d \
+		   ${D}/${sysconfdir}/network/if-down.d \
+		   ${D}/${sysconfdir}/network/if-post-down.d
+	install -m 0644 ${FILESDIR}/options ${D}/${sysconfdir}/network/options
+	install -m 0755 ${FILESDIR}/init ${D}/${sysconfdir}/init.d/networking
+	install -m 0644 etc-rpc ${D}/${sysconfdir}/rpc
+	install -m 0644 etc-protocols ${D}/${sysconfdir}/protocols
+	install -m 0644 etc-services ${D}/${sysconfdir}/services
 	install -m 0755 update-inetd ${D}/${sbindir}/
 	install -m 0644 update-inetd.8 ${D}/${mandir}/man8/
 }
 
 pkg_postinst () {
 	if test -n "${D}"; then
-		D="-r $D"
+		D="-r ${D}"
 	fi
 	update-rc.d $D networking start 40 S . stop 40 0 6 1 .
 }
 
 pkg_prerm () {
 	if test -n "${D}"; then
-		D="-r $D"
+		D="-r ${D}"
 	fi
 	update-rc.d $D networking remove
 }
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 853ea395a3..3246081690 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -26,8 +26,11 @@ do_configure_prepend() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/{bin,apps/Applications,apps/Settings,pics/launcher}
-	install -d ${D}/etc/init.d/
+	install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/apps/Settings \
+		   ${D}/${palmtopdir}/pics/launcher \
+		   ${D}/etc/init.d
 	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
 	install -m 0644 ${WORKDIR}/apps/Settings/Calibrate.desktop ${D}/${palmtopdir}/apps/Settings/Calibrate.desktop
 	install -m 0644 ${WORKDIR}/pics/launcher/*.* ${D}/${palmtopdir}/pics/launcher/
diff --git a/patcher/patcher-native.oe b/patcher/patcher-native.oe
index 3218204427..49890d3399 100644
--- a/patcher/patcher-native.oe
+++ b/patcher/patcher-native.oe
@@ -4,4 +4,5 @@ DEPENDS = ""
 
 do_stage() {
 	install -m 0755 ${DL_DIR}/patcher ${STAGING_BINDIR}/
+	exit 1
 }
diff --git a/pcmcia-cs/pcmcia-cs_3.2.7.oe b/pcmcia-cs/pcmcia-cs_3.2.7.oe
index f0509bd172..d577445dea 100644
--- a/pcmcia-cs/pcmcia-cs_3.2.7.oe
+++ b/pcmcia-cs/pcmcia-cs_3.2.7.oe
@@ -16,12 +16,13 @@ do_configure() {
 }
 
 do_install() {
-	install -d ${D}/${sbindir}/
+	install -d ${D}/${sbindir}
 	for f in cardmgr/cardctl cardmgr/cardmgr cardmgr/ide_info cardmgr/ifport cardmgr/ifuser cardmgr/pcinitrd flash/ftl_check flash/ftl_format
 	do
 		install -m 0755 $f ${D}/${sbindir}/
 	done
-	install -d ${D}/${sysconfdir}/{init.d,pcmcia}
+	install -d ${D}/${sysconfdir}/init.d \
+		   ${D}/${sysconfdir}/pcmcia
 	cp -a etc/* ${D}/${sysconfdir}/pcmcia/
 	install -m 0755 etc/rc.pcmcia ${D}/${sysconfdir}/init.d/pcmcia
 }
diff --git a/petitepainture/petitepainture_1.0.oe b/petitepainture/petitepainture_1.0.oe
index 784ddc106c..ea06977683 100644
--- a/petitepainture/petitepainture_1.0.oe
+++ b/petitepainture/petitepainture_1.0.oe
@@ -12,9 +12,11 @@ inherit palmtop
 QMAKE_PROFILES = "spainter.pro"
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-        install -D -m 755 petitpeintu ${D}${palmtopdir}/bin/petitpeintu
-        install -D -m 644 ${FILESDIR}/petitpeintu.desktop ${D}${palmtopdir}/Applications/petitpeintu.desktop
-        install -d ${D}${palmtopdir}/pics
-        cp -a *.png ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics
+        install -D -m 755 petitpeintu ${D}/${palmtopdir}/bin/petitpeintu
+        install -D -m 644 ${FILESDIR}/petitpeintu.desktop ${D}/${palmtopdir}/Applications/petitpeintu.desktop
+        install -d ${D}/${palmtopdir}/pics
+        cp -a *.png ${D}/${palmtopdir}/pics/
 }
diff --git a/pocketcellar/pocketcellar_1.1.oe b/pocketcellar/pocketcellar_1.1.oe
index 72b7038434..67e508a19b 100644
--- a/pocketcellar/pocketcellar_1.1.oe
+++ b/pocketcellar/pocketcellar_1.1.oe
@@ -13,13 +13,15 @@ inherit palmtop
 EXTRA_QMAKEVARS_POST = " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-	install -d ${D}/home/root/Settings/
-	cp -a pkg-pcellar/home/QtPalmtop/* ${D}${palmtopdir}/
-	cp -a pkg-pcellar/home/root/Settings/* ${D}/home/root/Settings/
-        install -D -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}/bin/pocketcellar
-        install -D -m 644 pocketcellar.desktop ${D}${palmtopdir}/Applications/pocketcellar.desktop
-        cp pocketcellar.png ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics
+	cp -a pkg-pcellar/home/QtPalmtop/* ${D}/${palmtopdir}/
+# BAD.  packages -never- install files into home directories.  ever. --CL
+#	cp -a pkg-pcellar/home/root/Settings/* ${D}/home/root/Settings/
+        install -D -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}/${palmtopdir}/bin/pocketcellar
+        install -D -m 644 pocketcellar.desktop ${D}/${palmtopdir}/Applications/pocketcellar.desktop
+        cp pocketcellar.png ${D}/${palmtopdir}/pics/
 }
 
 FILES_${PN} = "/"
diff --git a/poqetpresenter/poqetpresenter_0.0.6.oe b/poqetpresenter/poqetpresenter_0.0.6.oe
index 8488551922..4d14986e71 100644
--- a/poqetpresenter/poqetpresenter_0.0.6.oe
+++ b/poqetpresenter/poqetpresenter_0.0.6.oe
@@ -15,9 +15,11 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-        install -D -m 0755 poqetp/poqetp ${D}${palmtopdir}/bin/poqetp
-        install -D -m 0644 poqetp.desktop ${D}${palmtopdir}/Applications/poqetp.desktop
-        install -d ${D}${palmtopdir}/pics/poqetp
-        cp -a pics/* ${D}${palmtopdir}/pics/poqetp/
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics
+        install -D -m 0755 poqetp/poqetp ${D}/${palmtopdir}/bin/poqetp
+        install -D -m 0644 poqetp.desktop ${D}/${palmtopdir}/Applications/poqetp.desktop
+        install -d ${D}/${palmtopdir}/pics/poqetp
+        cp -a pics/* ${D}/${palmtopdir}/pics/poqetp/
 }
diff --git a/prboom/prboom_2.3.0.oe b/prboom/prboom_2.3.0.oe
index 9a2e9d1c93..26afefc4e3 100644
--- a/prboom/prboom_2.3.0.oe
+++ b/prboom/prboom_2.3.0.oe
@@ -15,10 +15,12 @@ do_configure() {
 }
 
 do_install() {
-	install -d ${D}${palmtopdir}/{bin,apps/Games,pics}
-	install -m 0755 src/prboom ${D}${palmtopdir}/bin/prboom
-	install -m 0644 ${FILESDIR}/prboom.png ${D}${palmtopdir}/pics/prboom.png
-	install -m 0644 ${FILESDIR}/prboom.desktop ${D}${palmtopdir}/Games/prboom.desktop
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Games \
+        	   ${D}/${palmtopdir}/pics
+	install -m 0755 src/prboom ${D}/${palmtopdir}/bin/prboom
+	install -m 0644 ${FILESDIR}/prboom.png ${D}/${palmtopdir}/pics/prboom.png
+	install -m 0644 ${FILESDIR}/prboom.desktop ${D}/${palmtopdir}/Games/prboom.desktop
 }
 
 FILES_${PN} = "${palmtopdir}/
diff --git a/qpegps/qpegps_0.9.2.oe b/qpegps/qpegps_0.9.2.oe
index c621c023db..7e7efdb6e2 100644
--- a/qpegps/qpegps_0.9.2.oe
+++ b/qpegps/qpegps_0.9.2.oe
@@ -14,11 +14,17 @@ inherit palmtop
 QMAKE_PROFILES = "qpegps.pro"
 
 do_install() {
-        install -d ${D}${palmtopdir}/{help/html/qpegps_icons,bin,apps/Applications,pics/qpegps,qpegps/{maps,icons,tracks}}
-        install -m 0755 qpegps ${D}${palmtopdir}/bin/
-        install -m 0644 ${FILESDIR}/qpegps.desktop ${D}${palmtopdir}/Applications/
-        install -m 0644 ${FILESDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
-        install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
-        install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
-        install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics/qpegps \
+        	   ${D}/${palmtopdir}/help/html/qpegps_icons \
+        	   ${D}/${palmtopdir}/qpegps/maps \
+        	   ${D}/${palmtopdir}/qpegps/icons \
+        	   ${D}/${palmtopdir}/qpegps/tracks
+        install -m 0755 qpegps ${D}/${palmtopdir}/bin/
+        install -m 0644 ${FILESDIR}/qpegps.desktop ${D}/${palmtopdir}/Applications/
+        install -m 0644 ${FILESDIR}/qpegps.png ${D}/${palmtopdir}/pics/qpegps/
+        install -m 0644 doc/qpegps.html ${D}/${palmtopdir}/help/html/
+        install -m 0644 doc/qpegps_icons/*.png ${D}/${palmtopdir}/help/html/qpegps_icons/
+        install -m 0644 icons/*.xpm ${D}/${palmtopdir}/qpegps/icons/
 }
diff --git a/qplot/qplot_2.0.1cvs.oe b/qplot/qplot_2.0.1cvs.oe
index 70543db45d..835c5860db 100644
--- a/qplot/qplot_2.0.1cvs.oe
+++ b/qplot/qplot_2.0.1cvs.oe
@@ -12,12 +12,16 @@ S = "${WORKDIR}/qplot"
 inherit palmtop
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics,lib,plugins/inputmethods}
-        install -D -m 755 qplotmain/qplot ${D}${palmtopdir}/bin/qplot
-        install -D -m 644 qplotmain/qplot.png ${D}${palmtopdir}/pics/
-        install -D -m 644 qplotmain/qplot-const.b ${D}${palmtopdir}/lib/
-        install -D -m 644 qplotmain/qplot-math.b ${D}${palmtopdir}/lib/
-	oe_soinstall qplotmath/libqplotmath.so.1.0.0 ${D}${palmtopdir}/plugins/inputmethods/
-        install -D -m 644 qplot.desktop ${D}${palmtopdir}/Applications/qplot.desktop
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics \
+        	   ${D}/${palmtopdir}/lib \
+        	   ${D}/${palmtopdir}/plugins/inputmethods
+        install -D -m 755 qplotmain/qplot ${D}/${palmtopdir}/bin/qplot
+        install -D -m 644 qplotmain/qplot.png ${D}/${palmtopdir}/pics/
+        install -D -m 644 qplotmain/qplot-const.b ${D}/${palmtopdir}/lib/
+        install -D -m 644 qplotmain/qplot-math.b ${D}/${palmtopdir}/lib/
+	oe_soinstall qplotmath/libqplotmath.so.1.0.0 ${D}/${palmtopdir}/plugins/inputmethods/
+        install -D -m 644 qplot.desktop ${D}/${palmtopdir}/Applications/qplot.desktop
 }
 
diff --git a/qwt/qwt_4.2.0rc1.oe b/qwt/qwt_4.2.0rc1.oe
index 4974e0085f..afbfd39c86 100644
--- a/qwt/qwt_4.2.0rc1.oe
+++ b/qwt/qwt_4.2.0rc1.oe
@@ -17,7 +17,8 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/{${libdir},${includedir}}
+	install -d ${D}/${libdir} \
+		   ${D}/${includedir}
 	oe_soinstall lib/libqwt.so.4.2.0 ${D}/${libdir}
 	cp -a include/* ${D}/${includedir}
 }
diff --git a/shopper/shopper_1.2.0.oe b/shopper/shopper_1.2.0.oe
index b6c29c1760..0caa1a9920 100644
--- a/shopper/shopper_1.2.0.oe
+++ b/shopper/shopper_1.2.0.oe
@@ -24,11 +24,14 @@ pkg_postinst() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{help/html/,bin,apps/Applications,pics}
-        install -d ${D}/root/Applications/ShoppingListQt/
-        install -m 0755 ${S}/Shopper ${D}${palmtopdir}/bin/
-        install -m 0644 ${S}/Shopper.desktop ${D}${palmtopdir}/apps/Applications/
-        install -m 0644 ${S}/Shopper.png ${D}${palmtopdir}/pics/
-        install -m 0644 ${S}/Shopper.html ${D}${palmtopdir}/help/html/
-        install -m 0644 ${S}/shoppinglist.xml ${D}/root/Applications/ShoppingListQt/shoppinglist.xml.new
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics \
+        	   ${D}/${palmtopdir}/help/html
+        install -m 0755 ${S}/Shopper ${D}/${palmtopdir}/bin/
+        install -m 0644 ${S}/Shopper.desktop ${D}/${palmtopdir}/apps/Applications/
+        install -m 0644 ${S}/Shopper.png ${D}/${palmtopdir}/pics/
+        install -m 0644 ${S}/Shopper.html ${D}/${palmtopdir}/help/html/
+# BAD BAD BAD: packages never install into home directories. ever. --CL
+#        install -m 0644 ${S}/shoppinglist.xml ${D}/root/Applications/ShoppingListQt/shoppinglist.xml.new
 }
diff --git a/sidplayer/sidplayer_1.5.0.oe b/sidplayer/sidplayer_1.5.0.oe
index eba2d0c72c..124d5d7add 100644
--- a/sidplayer/sidplayer_1.5.0.oe
+++ b/sidplayer/sidplayer_1.5.0.oe
@@ -14,6 +14,8 @@ EXTRA_QMAKEVARS_PRE = "QMAKE_INCDIR=${STAGING_INCDIR}/sidplay"
 inherit palmtop
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-	cp -a ../apps ../bin ../pics ${D}${palmtopdir}/        
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics
+	cp -a ../apps ../bin ../pics ${D}/${palmtopdir}/        
 }
diff --git a/subapplet/subapplet_1.0.7.oe b/subapplet/subapplet_1.0.7.oe
index ad186d7825..cd009f5f6c 100644
--- a/subapplet/subapplet_1.0.7.oe
+++ b/subapplet/subapplet_1.0.7.oe
@@ -14,7 +14,8 @@ inherit palmtop
 QMAKE_PROFILES = "subapplet.pro"
 
 do_install() {
-        install -d ${D}${palmtopdir}/{pics/subapplet,plugins/applets}
-        install -m 0644 *.png ${D}${palmtopdir}/pics/subapplet/
-	oe_soinstall rel${palmtopdir}/plugins/applets/libsubapplet.so.1.0 ${D}${palmtopdir}/plugins/applets/
+        install -d ${D}/${palmtopdir}/plugins/applets \
+        	   ${D}/${palmtopdir}/pics
+        install -m 0644 *.png ${D}/${palmtopdir}/pics/subapplet/
+	oe_soinstall rel${palmtopdir}/plugins/applets/libsubapplet.so.1.0 ${D}/${palmtopdir}/plugins/applets/
 }
diff --git a/tximage/tximage_0.2.oe b/tximage/tximage_0.2.oe
index 14479dd5c5..aa40a69da4 100644
--- a/tximage/tximage_0.2.oe
+++ b/tximage/tximage_0.2.oe
@@ -11,8 +11,10 @@ SRC_URI = "http://downloads.zaurususergroup.com/community/66.180.235.230/downloa
 inherit palmtop
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-        install -D -m 755 tximage ${D}${palmtopdir}/bin/tximage
-        install -D -m 644 imageviewer.desktop ${D}${palmtopdir}/apps/Applications/tximage.desktop
-        cp -a tximage.png ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics \
+        	   ${D}/${palmtopdir}/bin
+        install -D -m 755 tximage ${D}/${palmtopdir}/bin/tximage
+        install -D -m 644 imageviewer.desktop ${D}/${palmtopdir}/apps/Applications/tximage.desktop
+        cp -a tximage.png ${D}/${palmtopdir}/pics/
 }
diff --git a/vectoroids/vectoroids_1.1.0.oe b/vectoroids/vectoroids_1.1.0.oe
index c8952d8c7c..34bb164a00 100644
--- a/vectoroids/vectoroids_1.1.0.oe
+++ b/vectoroids/vectoroids_1.1.0.oe
@@ -16,15 +16,18 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Games,pics,share/vectoroids}
-        install -D -m 0755 vectoroids ${D}${palmtopdir}/bin/vectoroids
-	install -D -m 0644 data/images/icon.png ${D}${palmtopdir}/pics/vectoroids.png
-	cp -a data/* ${D}${palmtopdir}/share/vectoroids
+        install -d ${D}/${palmtopdir}/apps/Games \
+        	   ${D}/${palmtopdir}/pics \
+        	   ${D}/${palmtopdir}/share/vectoroids \
+        	   ${D}/${palmtopdir}/bin
+        install -D -m 0755 vectoroids ${D}/${palmtopdir}/bin/vectoroids
+	install -D -m 0644 data/images/icon.png ${D}/${palmtopdir}/pics/vectoroids.png
+	cp -a data/* ${D}/${palmtopdir}/share/vectoroids
 
-	echo "[Desktop Entry]" >${D}${palmtopdir}/Games/vectoroids.desktop
-	echo "Comment=Asteroids game" >>${D}${palmtopdir}/Games/vectoroids.desktop
-	echo "Exec=vectoroids" >>${D}${palmtopdir}/Games/vectoroids.desktop
-	echo "Icon=vectoroids" >>${D}${palmtopdir}/Games/vectoroids.desktop
-	echo "Type=Application" >>${D}${palmtopdir}/Games/vectoroids.desktop
-	echo "Name=Vectoroids" >>${D}${palmtopdir}/Games/vectoroids.desktop
+	echo "[Desktop Entry]" >${D}/${palmtopdir}/Games/vectoroids.desktop
+	echo "Comment=Asteroids game" >>${D}/${palmtopdir}/Games/vectoroids.desktop
+	echo "Exec=vectoroids" >>${D}/${palmtopdir}/Games/vectoroids.desktop
+	echo "Icon=vectoroids" >>${D}/${palmtopdir}/Games/vectoroids.desktop
+	echo "Type=Application" >>${D}/${palmtopdir}/Games/vectoroids.desktop
+	echo "Name=Vectoroids" >>${D}/${palmtopdir}/Games/vectoroids.desktop
 }
diff --git a/vera-fonts/qpf-bitstream-vera_1.10.oe b/vera-fonts/qpf-bitstream-vera_1.10.oe
index e69de29bb2..7631d206b6 100644
--- a/vera-fonts/qpf-bitstream-vera_1.10.oe
+++ b/vera-fonts/qpf-bitstream-vera_1.10.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "The Bitstream Vera fonts - QPF Edition"
+SECTION = "fonts"
+PRIORITY = "optional"
+
+SRC_URI = "http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz"
+S = "${WORKDIR}/vera-qpf"
+
+do_install () { 
+        install -d ${D}${palmtopqtdir}/lib/fonts/ 
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmtopqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+
+. /etc/profile
+
+update-qtfontdir
+}
+
+PACKAGES = "qpf-bitstream-vera-small qpf-bitstream-vera-large"
+FILES_qpf-bitstream-vera-small = "vera_80_50* vera_80_50i* vera_80_75* vera_80_75i* vera_100_50* vera_100_50i* vera_100_75* vera_100_75i* vera_120_50* vera_120_50i* vera_120_75* vera_120_75i*"
+FILES_qpf-bitstream-vera-large = "vera_140_50* vera_140_50i* vera_140_75* vera_140_75i* vera_160_50* vera_160_50i* vera_160_75* vera_160_75i* vera_180_50* vera_180_50i* vera_180_75* vera_180_75i*"
diff --git a/wellenreiter/wellenreiter_cvs.oe b/wellenreiter/wellenreiter_cvs.oe
index 1262dbcf59..52181f658f 100644
--- a/wellenreiter/wellenreiter_cvs.oe
+++ b/wellenreiter/wellenreiter_cvs.oe
@@ -14,9 +14,10 @@ S = "${WORKDIR}/wellenreiter"
 inherit opie
 
 do_install() {
-	install -d ${D}${palmtopdir}/{bin,apps/Applications,pics/${PN}}
+        install -d ${D}/${palmtopdir}/apps/Applications \
+        	   ${D}/${palmtopdir}/pics/wellenreiter \
+        	   ${D}/${palmtopdir}/bin
 	install -m 0755 ${PN} ${D}${palmtopdir}/bin/${PN}
 	install -m 0644 ${WORKDIR}/apps/Applications/${PN}.desktop ${D}${palmtopdir}/apps/Applications/${PN}.desktop
 	install -m 0644 ${WORKDIR}/pics/${PN}/*.* ${D}${palmtopdir}/pics/${PN}/
 }
-
diff --git a/xmms-embedded/xmms-embedded_20040327.oe b/xmms-embedded/xmms-embedded_20040327.oe
index 6d9b1d30d1..9d176f875a 100644
--- a/xmms-embedded/xmms-embedded_20040327.oe
+++ b/xmms-embedded/xmms-embedded_20040327.oe
@@ -24,23 +24,29 @@ do_configure_prepend() {
 }
 
 do_install() {
-    install -d ${D}/opt/QtPalmtop/lib/xmms/{Effect,General,Input,Output,skin}
-    install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-    install -m 0644 xmms/General/QPEgui/xmms.desktop ${D}/opt/QtPalmtop/apps/Applications/xmms.desktop
-    install -m 0644 ${FILESDIR}/xmms.png ${D}/opt/QtPalmtop/pics/xmms.png
-    install -m 0755 compiled/bin/xmms ${D}/opt/QtPalmtop/bin/xmms
-    oe_soinstall compiled/libxmms.so.1.0.0 ${D}/opt/QtPalmtop/lib
-    oe_soinstall compiled/xmms/General/libQPEgui.so.1.0.0 ${D}/opt/QtPalmtop/lib/xmms/General
+    install -d ${D}/${palmtopdir}/lib/xmms/Effect \
+               ${D}/${palmtopdir}/lib/xmms/General \
+               ${D}/${palmtopdir}/lib/xmms/Input \
+               ${D}/${palmtopdir}/lib/xmms/Output \
+               ${D}/${palmtopdir}/lib/xmms/skin \
+               ${D}/${palmtopdir}/bin \
+               ${D}/${palmtopdir}/apps/Applications \
+               ${D}/${palmtopdir}/pics
+    install -m 0644 xmms/General/QPEgui/xmms.desktop ${D}/${palmtopdir}/apps/Applications/xmms.desktop
+    install -m 0644 ${FILESDIR}/xmms.png ${D}/${palmtopdir}/pics/xmms.png
+    install -m 0755 compiled/bin/xmms ${D}/${palmtopdir}/bin/xmms
+    oe_soinstall compiled/libxmms.so.1.0.0 ${D}/${palmtopdir}/lib
+    oe_soinstall compiled/xmms/General/libQPEgui.so.1.0.0 ${D}/${palmtopdir}/lib/xmms/General
     for f in libfixpvorbisplugin.so.1.0.0 libmplayer.so.1.0.0 libshorten.so.1.0.0 \
 		libwav.so.1.0.0 libxmms-mad.so.1.0.0 libxmms-sid.so.1.0.0
     do
-        oe_soinstall compiled/xmms/Input/${f} ${D}/opt/QtPalmtop/lib/xmms/Input
+        oe_soinstall compiled/xmms/Input/${f} ${D}/${palmtopdir}/lib/xmms/Input
     done
-    oe_soinstall compiled/xmms/Output/liboss.so.1.0.0 ${D}/opt/QtPalmtop/lib/xmms/Output
+    oe_soinstall compiled/xmms/Output/liboss.so.1.0.0 ${D}/${palmtopdir}/lib/xmms/Output
     for f in eject.png fileadd.png main.png norep.png pause.png play.png rew.png \
 		shuf.png stop.png ff.png filedel.png move.png noshuf.png plalap.png \
 		rep.png save.png skinconf urladd.png
     do
-        install -m 0644 Skins/winamp_xmms/${f} ${D}/opt/QtPalmtop/lib/xmms/skin/${f}
+        install -m 0644 Skins/winamp_xmms/${f} ${D}/${palmtopdir}/lib/xmms/skin/${f}
     done
 }
diff --git a/zbench/zbench_2.0.oe b/zbench/zbench_2.0.oe
index 42cb9ef44f..d3a92a13b2 100644
--- a/zbench/zbench_2.0.oe
+++ b/zbench/zbench_2.0.oe
@@ -10,8 +10,10 @@ SRC_URI = "http://www.vanille.de/mirror/zbench-${PV}.tar.bz2"
 inherit palmtop
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics}
-        install -D -m 755 zbench ${D}${palmtopdir}/bin/zbench
-        install -D -m 644 zbench.desktop ${D}${palmtopdir}/Applications/zbench.desktop
-        cp zbench.png ${D}${palmtopdir}/pics/
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/pics
+        install -D -m 755 zbench ${D}/${palmtopdir}/bin/zbench
+        install -D -m 644 zbench.desktop ${D}/${palmtopdir}/Applications/zbench.desktop
+        cp zbench.png ${D}/${palmtopdir}/pics/
 }
diff --git a/zgscore/zgscore_1.0.0.oe b/zgscore/zgscore_1.0.0.oe
index 628ce5fe8c..54d4dc46da 100644
--- a/zgscore/zgscore_1.0.0.oe
+++ b/zgscore/zgscore_1.0.0.oe
@@ -14,7 +14,9 @@ inherit palmtop
 EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
 
 do_install() {
-	install -d ${D}/${palmtopdir}/{bin,pics,apps/Applications}
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/pics
         install -m 0755 zgscore ${D}/${palmtopdir}/bin/zgscore
 	install -m 0755 zgscore.png ${D}/${palmtopdir}/pics/
 	install -m 0644 zgscore.desktop ${D}/${palmtopdir}/apps/Applications/
diff --git a/zsafe/zsafe_2.1.2.oe b/zsafe/zsafe_2.1.2.oe
index ae80430758..9b477d3d0d 100644
--- a/zsafe/zsafe_2.1.2.oe
+++ b/zsafe/zsafe_2.1.2.oe
@@ -14,9 +14,11 @@ inherit palmtop
 QMAKE_PROFILES = "zsafe.pro"
 
 do_install() {
-        install -d ${D}${palmtopdir}/{bin,apps/Applications,pics/zsafe}
-        install -D -m 0755 ${PN} ${D}${palmtopdir}/bin/${PN}
-        install -D -m 0644 ${PN}.png ${D}${palmtopdir}/pics/${PN}.png
-	cp -a pics/zsafe/*.xpm ${D}${palmtopdir}/pics/zsafe
-	cp zsafe.desktop ${D}${palmtopdir}/Applications
+        install -d ${D}/${palmtopdir}/bin \
+		   ${D}/${palmtopdir}/apps/Applications \
+		   ${D}/${palmtopdir}/pics/zsafe
+        install -D -m 0755 ${PN} ${D}/${palmtopdir}/bin/${PN}
+        install -D -m 0644 ${PN}.png ${D}/${palmtopdir}/pics/${PN}.png
+	cp -a pics/zsafe/*.xpm ${D}/${palmtopdir}/pics/zsafe
+	cp zsafe.desktop ${D}/${palmtopdir}/Applications
 }