Merge bk://openembedded@openembedded.bkbits.net/packages

into allanon.vanille.de:/usr/local/projects/oe-packages

2004/03/27 15:46:46+01:00 vanille.de!mickey
/opt/QtPalmtop/ ==> ${palmtopdir}

BKrev: 406593dfsCKZkIBjxUpsmUIQNX4aHA

34 files changed, 201 insertions, 180 deletions

diff --git a/aliens/aliens_1.0.0.oe b/aliens/aliens_1.0.0.oe
index 89465eea0f..d6140fe310 100644
--- a/aliens/aliens_1.0.0.oe
+++ b/aliens/aliens_1.0.0.oe
@@ -18,8 +18,8 @@ do_compile_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics,share/aliens}
-        install -D -m 0755 aliens ${D}/opt/QtPalmtop/bin/aliens
-	install -D -m 0644 aliens.png ${D}/opt/QtPalmtop/pics/aliens.png
-        install -D -m 0644 aliens.desktop ${D}/opt/QtPalmtop/apps/Games/aliens.desktop
+        install -d ${D}${palmtopdir}{bin,apps/Games,pics,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}apps/Games/aliens.desktop
 }
diff --git a/billiardz/billiardz_0.1.4.oe b/billiardz/billiardz_0.1.4.oe
index 58072bf18d..b3c40f0149 100644
--- a/billiardz/billiardz_0.1.4.oe
+++ b/billiardz/billiardz_0.1.4.oe
@@ -15,15 +15,15 @@ QMAKE_PROFILES = "billiardz.arm.pro"
 EXTRA_QMAKEVARS_POST = "DEFINES-=FPM_INTEL" 
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics/billiardz}
-        install -D -m 0755 ${PN} ${D}/opt/QtPalmtop/bin/${PN}
-        install -D -m 0644 ${PN}.png ${D}/opt/QtPalmtop/pics/${PN}.png
-	cp -a images/*.png ${D}/opt/QtPalmtop/pics/billiardz
+        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
 
-	echo "[Desktop Entry] " >${D}/opt/QtPalmtop/apps/Games/billiardz.desktop
-	echo "Comment=Billiards for Zaurus" >>${D}/opt/QtPalmtop/apps/Games/billiardz.desktop
-	echo "Exec=billiardz" >>${D}/opt/QtPalmtop/apps/Games/billiardz.desktop
-	echo "Icon=billiardz" >>${D}/opt/QtPalmtop/apps/Games/billiardz.desktop
-	echo "Type=Application" >>${D}/opt/QtPalmtop/apps/Games/billiardz.desktop
-	echo "Name=BilliardZ" >>${D}/opt/QtPalmtop/apps/Games/billiardz.desktop
+	echo "[Desktop Entry] " >${D}${palmtopdir}apps/Games/billiardz.desktop
+	echo "Comment=Billiards for Zaurus" >>${D}${palmtopdir}apps/Games/billiardz.desktop
+	echo "Exec=billiardz" >>${D}${palmtopdir}apps/Games/billiardz.desktop
+	echo "Icon=billiardz" >>${D}${palmtopdir}apps/Games/billiardz.desktop
+	echo "Type=Application" >>${D}${palmtopdir}apps/Games/billiardz.desktop
+	echo "Name=BilliardZ" >>${D}${palmtopdir}apps/Games/billiardz.desktop
 }
diff --git a/brickout/brickout_2002.06.09.oe b/brickout/brickout_2002.06.09.oe
index 7cf6c0c954..4597c50267 100644
--- a/brickout/brickout_2002.06.09.oe
+++ b/brickout/brickout_2002.06.09.oe
@@ -18,18 +18,18 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics,share/brickout/{sounds,music,images}}
-        install -D -m 0755 brickout ${D}/opt/QtPalmtop/bin/brickout
-	install -D -m 0644 brickout.png ${D}/opt/QtPalmtop/pics/brickout.png
+        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
 
-        cp -a sounds/* ${D}/opt/QtPalmtop/share/brickout/sounds/
-        cp -a music/* ${D}/opt/QtPalmtop/share/brickout/music/
-        cp -a images-sdl/* ${D}/opt/QtPalmtop/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}/opt/QtPalmtop/apps/Games/brickout.desktop
-	echo "Comment=Arkanoid game" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
-	echo "Exec=brickout" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
-	echo "Icon=brickout" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
-	echo "Type=Application" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
-	echo "Name=Brickout" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+	echo "[Desktop Entry]" >${D}${palmtopdir}apps/Games/brickout.desktop
+	echo "Comment=Arkanoid game" >>${D}${palmtopdir}apps/Games/brickout.desktop
+	echo "Exec=brickout" >>${D}${palmtopdir}apps/Games/brickout.desktop
+	echo "Icon=brickout" >>${D}${palmtopdir}apps/Games/brickout.desktop
+	echo "Type=Application" >>${D}${palmtopdir}apps/Games/brickout.desktop
+	echo "Name=Brickout" >>${D}${palmtopdir}apps/Games/brickout.desktop
 }
diff --git a/cumulus/cumulus_1.1.oe b/cumulus/cumulus_1.1.oe
index 47eb524f3d..0096713f9e 100644
--- a/cumulus/cumulus_1.1.oe
+++ b/cumulus/cumulus_1.1.oe
@@ -19,10 +19,10 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-        install -D -m 0755 cumulus/cumulus ${D}/opt/QtPalmtop/bin/cumulus
-        install -D -m 0644 cumulus/cumulus.desktop ${D}/opt/QtPalmtop/apps/Applications/cumulus.desktop
-        install -D -m 0644 cumulus.png ${D}/opt/QtPalmtop/pics/cumulus.png
-        install -d ${D}/opt/QtPalmtop/pics/mapicons
-        cp -a cumulus/map-icons/* ${D}/opt/QtPalmtop/pics/mapicons
+        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}apps/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 277fbb1cb6..32917f8498 100644
--- a/dviviewer/dviviewer_1.0.1.oe
+++ b/dviviewer/dviviewer_1.0.1.oe
@@ -11,9 +11,9 @@ S = "${WORKDIR}/dviviewer"
 inherit palmtop
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-        install -D -m 755 dviviewer ${D}/opt/QtPalmtop/bin/dviviewer
-        install -D -m 644 dviviewer.desktop ${D}/opt/QtPalmtop/apps/Applications/dviviewer.desktop
-        install -d ${D}/opt/QtPalmtop/pics
-        cp -a *.png ${D}/opt/QtPalmtop/pics/
+        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}apps/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 ab3a8ee78f..4d057c7ea2 100644
--- a/freedroid/freedroid_1.0.2.oe
+++ b/freedroid/freedroid_1.0.2.oe
@@ -11,25 +11,25 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freedroid/freedroid-${PV}.tar.gz"
 inherit autotools libtool
 
 do_compile() {
-	oe_runmake pkgdatadir=/opt/QtPalmtop/share/freedroid
+	oe_runmake pkgdatadir=${palmtopdir}share/freedroid
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics,share/freedroid/{graphics,map,sound}}
-        install -D -m 0755 src/freedroid ${D}/opt/QtPalmtop/bin/freedroid
-	install -D -m 0644 ${FILESDIR}/icon.png ${D}/opt/QtPalmtop/pics/freedroid.png
+        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
 
-	cp -a graphics/* ${D}/opt/QtPalmtop/share/freedroid/graphics
-	cp -a map/* ${D}/opt/QtPalmtop/share/freedroid/map
-	cp -a sound/* ${D}/opt/QtPalmtop/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}/opt/QtPalmtop/apps/Games/freedroid.desktop
-	echo "Comment=A Paradroid Clone" >>${D}/opt/QtPalmtop/apps/Games/freedroid.desktop
-	echo "Exec=freedroid" >>${D}/opt/QtPalmtop/apps/Games/freedroid.desktop
-	echo "Icon=freedroid" >>${D}/opt/QtPalmtop/apps/Games/freedroid.desktop
-	echo "Type=Application" >>${D}/opt/QtPalmtop/apps/Games/freedroid.desktop
-	echo "Name=Freedroid" >>${D}/opt/QtPalmtop/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} = ""
-FILES_${PN} = "/opt/QtPalmtop/"
+FILES_${PN} = "${palmtopdir}"
diff --git a/gemdropx/gemdropx_0.9.oe b/gemdropx/gemdropx_0.9.oe
index d6153486e8..0d4eb47cc2 100644
--- a/gemdropx/gemdropx_0.9.oe
+++ b/gemdropx/gemdropx_0.9.oe
@@ -18,15 +18,15 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics,share/gemdropx}
-        install -D -m 0755 gemdropx ${D}/opt/QtPalmtop/bin/gemdropx
-	install -D -m 0644 ${FILESDIR}/icon.png ${D}/opt/QtPalmtop/pics/gemdropx.png
-	cp -a data/* ${D}/opt/QtPalmtop/share/gemdropx
+        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
 
-	echo "[Desktop Entry]" >${D}/opt/QtPalmtop/apps/Games/gemdropx.desktop
-	echo "Comment=Puzzle game" >>${D}/opt/QtPalmtop/apps/Games/gemdropx.desktop
-	echo "Exec=gemdropx" >>${D}/opt/QtPalmtop/apps/Games/gemdropx.desktop
-	echo "Icon=gemdropx" >>${D}/opt/QtPalmtop/apps/Games/gemdropx.desktop
-	echo "Type=Application" >>${D}/opt/QtPalmtop/apps/Games/gemdropx.desktop
-	echo "Name=GemdropX" >>${D}/opt/QtPalmtop/apps/Games/gemdropx.desktop
+	echo "[Desktop Entry]" >${D}${palmtopdir}apps/Games/gemdropx.desktop
+	echo "Comment=Puzzle game" >>${D}${palmtopdir}apps/Games/gemdropx.desktop
+	echo "Exec=gemdropx" >>${D}${palmtopdir}apps/Games/gemdropx.desktop
+	echo "Icon=gemdropx" >>${D}${palmtopdir}apps/Games/gemdropx.desktop
+	echo "Type=Application" >>${D}${palmtopdir}apps/Games/gemdropx.desktop
+	echo "Name=GemdropX" >>${D}${palmtopdir}apps/Games/gemdropx.desktop
 }
diff --git a/gnuboy/qtopiagnuboy_1.0.3.oe b/gnuboy/qtopiagnuboy_1.0.3.oe
index c2a3a8950a..05dd8ff207 100644
--- a/gnuboy/qtopiagnuboy_1.0.3.oe
+++ b/gnuboy/qtopiagnuboy_1.0.3.oe
@@ -10,7 +10,7 @@ SRC_URI = "http://www.warmi.net/zaurus/files/gnuboy-${PV}-qtopia3.tar.gz \
 S = "${WORKDIR}/gnuboy"
 
 FILES = ""
-FILES_${PN} = "/opt/QtPalmtop"
+FILES_${PN} = "${palmtopdir}"
 
 QMAKE = "${STAGING_BINDIR}/qmake"
 QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
@@ -27,9 +27,9 @@ do_compile() {
 }
 
 do_install() {
-        install -m 755 -d ${D}/opt/QtPalmtop
-        install -m 755 -D qpe/bin/qtopiagnuboy ${D}/opt/QtPalmtop/bin/qtopiagnuboy
-        install -m 755 -D qpe/bin/qtopiagnuboyl ${D}/opt/QtPalmtop/bin/qtopiagnuboyl
-        install -m 644 -D qpe/pics/Gnuboy.png ${D}/opt/QtPalmtop/pics/Gnuboy.png
-        install -m 644 -D qpe/apps/Games/qtopiagnuboy.desktop ${D}/opt/QtPalmtop/apps/Games/qtopiagnuboy.desktop
+        install -m 755 -d ${D}${palmtopdir}
+        install -m 755 -D qpe/bin/qtopiagnuboy ${D}${palmtopdir}bin/qtopiagnuboy
+        install -m 755 -D qpe/bin/qtopiagnuboyl ${D}${palmtopdir}bin/qtopiagnuboyl
+        install -m 644 -D qpe/pics/Gnuboy.png ${D}${palmtopdir}pics/Gnuboy.png
+        install -m 644 -D qpe/apps/Games/qtopiagnuboy.desktop ${D}${palmtopdir}apps/Games/qtopiagnuboy.desktop
 }
diff --git a/irk/irk_0.10.0.oe b/irk/irk_0.10.0.oe
index 4fd7ee218c..06f8a58148 100644
--- a/irk/irk_0.10.0.oe
+++ b/irk/irk_0.10.0.oe
@@ -15,12 +15,12 @@ EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia"
 
 do_install() {
 	install -d ${D}/${sysconfdir}
-	install -d ${D}/opt/QtPalmtop/plugins/inputmethods/
+	install -d ${D}${palmtopdir}plugins/inputmethods/
 	install -d ${D}/home/root/Settings/
 
 	install chicony.conf ${D}/${sysconfdir}/lircd.conf
 	install IRK.conf ${D}/${sysconfdir}
-	oe_soinstall libirk.so.1.0.0 ${D}/opt/QtPalmtop/plugins/inputmethods/
+	oe_soinstall libirk.so.1.0.0 ${D}${palmtopdir}plugins/inputmethods/
 }
 
 FILES_irk_append=" /etc /home/root"
diff --git a/klimt/klimt_0.6.1.oe b/klimt/klimt_0.6.1.oe
index 432cb82206..0b7e860051 100644
--- a/klimt/klimt_0.6.1.oe
+++ b/klimt/klimt_0.6.1.oe
@@ -19,6 +19,6 @@ do_stage() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/lib
-        oe_soinstall ${STAGING_LIBDIR}/libKlimt.so.0.5.1 ${D}/opt/QtPalmtop/lib/
+        install -d ${D}${palmtopdir}lib
+        oe_soinstall ${STAGING_LIBDIR}/libKlimt.so.0.5.1 ${D}${palmtopdir}lib/
 }
diff --git a/knights/knights_1.14.oe b/knights/knights_1.14.oe
index 9f4a204509..0846185c57 100644
--- a/knights/knights_1.14.oe
+++ b/knights/knights_1.14.oe
@@ -20,9 +20,9 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics}
-        install -D -m 755 knights/knights ${D}/opt/QtPalmtop/bin/knights
-        install -D -m 644 knights.desktop ${D}/opt/QtPalmtop/apps/Games/knights.desktop
-        install -d ${D}/opt/QtPalmtop/pics
-        cp -a pics/knights ${D}/opt/QtPalmtop/pics/
+        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}apps/Games/knights.desktop
+        install -d ${D}${palmtopdir}pics
+        cp -a pics/knights ${D}${palmtopdir}pics/
 }
diff --git a/kstars/kstars-embedded_0.8.5.oe b/kstars/kstars-embedded_0.8.5.oe
index fd6dae3c0c..1cf7b7364f 100644
--- a/kstars/kstars-embedded_0.8.5.oe
+++ b/kstars/kstars-embedded_0.8.5.oe
@@ -11,10 +11,10 @@ S = "${WORKDIR}/kstars"
 inherit palmtop
 
 do_install() {
-    install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics/kstars,share/apps/kstars}
-    install -m 0755 ${STAGING_LIBDIR}/../bin/kstars ${D}/opt/QtPalmtop/bin/kstars
+    install -d ${D}${palmtopdir}{bin,apps/Applications,pics/kstars,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}/opt/QtPalmtop/apps/Applications
-    cp -a ${WORKDIR}/pics/kstars ${D}/opt/QtPalmtop/pics/
-    cp -a ${WORKDIR}/share/apps/kstars ${D}/opt/QtPalmtop/share/apps/
+    install -m 0644 ${WORKDIR}/apps/Applications/kstars.desktop ${D}${palmtopdir}apps/Applications
+    cp -a ${WORKDIR}/pics/kstars ${D}${palmtopdir}pics/
+    cp -a ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}share/apps/
 }
diff --git a/libopie/libopie2_20040225.oe b/libopie/libopie2_20040225.oe
index 8b95289903..ecbab344be 100644
--- a/libopie/libopie2_20040225.oe
+++ b/libopie/libopie2_20040225.oe
@@ -37,22 +37,22 @@ do_compile() {
 # lib files already done during do_compile
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/lib/
-	oe_soinstall ${STAGING_LIBDIR}/libopiecore2.so.1.8.5 ${D}/opt/QtPalmtop/lib/
-	oe_soinstall ${STAGING_LIBDIR}/libopiedb2.so.1.8.2 ${D}/opt/QtPalmtop/lib/
-	oe_soinstall ${STAGING_LIBDIR}/libopiemm2.so.1.8.2 ${D}/opt/QtPalmtop/lib/
-	oe_soinstall ${STAGING_LIBDIR}/libopienet2.so.1.8.3 ${D}/opt/QtPalmtop/lib/
-	oe_soinstall ${STAGING_LIBDIR}/libopiepim2.so.1.8.3 ${D}/opt/QtPalmtop/lib/
-	oe_soinstall ${STAGING_LIBDIR}/libopieui2.so.1.8.5 ${D}/opt/QtPalmtop/lib/
+	install -d ${D}${palmtopdir}lib/
+	oe_soinstall ${STAGING_LIBDIR}/libopiecore2.so.1.8.5 ${D}${palmtopdir}lib/
+	oe_soinstall ${STAGING_LIBDIR}/libopiedb2.so.1.8.2 ${D}${palmtopdir}lib/
+	oe_soinstall ${STAGING_LIBDIR}/libopiemm2.so.1.8.2 ${D}${palmtopdir}lib/
+	oe_soinstall ${STAGING_LIBDIR}/libopienet2.so.1.8.3 ${D}${palmtopdir}lib/
+	oe_soinstall ${STAGING_LIBDIR}/libopiepim2.so.1.8.3 ${D}${palmtopdir}lib/
+	oe_soinstall ${STAGING_LIBDIR}/libopieui2.so.1.8.5 ${D}${palmtopdir}lib/
 }
 
 PACKAGES = "libopiecore2 libopiedb2 libopiemm2 libopienet2 libopiepim2 libopieui2"
-FILES_libopiecore2 = "/opt/QtPalmtop/lib/libopiecore2.so.*"
-FILES_libopiedb2 = "/opt/QtPalmtop/lib/libopiedb2.so.*"
-FILES_libopiemm2 = "/opt/QtPalmtop/lib/libopiemm2.so.*"
-FILES_libopienet2 = "/opt/QtPalmtop/lib/libopienet2.so.*"
-FILES_libopiepim2 = "/opt/QtPalmtop/lib/libopiepim2.so.*"
-FILES_libopieui2 = "/opt/QtPalmtop/lib/libopieui2.so.*"
+FILES_libopiecore2 = "${palmtopdir}lib/libopiecore2.so.*"
+FILES_libopiedb2 = "${palmtopdir}lib/libopiedb2.so.*"
+FILES_libopiemm2 = "${palmtopdir}lib/libopiemm2.so.*"
+FILES_libopienet2 = "${palmtopdir}lib/libopienet2.so.*"
+FILES_libopiepim2 = "${palmtopdir}lib/libopiepim2.so.*"
+FILES_libopieui2 = "${palmtopdir}lib/libopieui2.so.*"
 
 #FIXME: Add individual package descriptions and dependencies
 
diff --git a/libqpe/libqpe-opie_1.0.3.oe b/libqpe/libqpe-opie_1.0.3.oe
index 36c2339276..2251a51754 100644
--- a/libqpe/libqpe-opie_1.0.3.oe
+++ b/libqpe/libqpe-opie_1.0.3.oe
@@ -52,9 +52,9 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/lib
-	oe_soinstall ${STAGING_LIBDIR}/libqpe.so.1.5.0 ${D}/opt/QtPalmtop/lib
+	install -d ${D}${palmtopdir}lib
+	oe_soinstall ${STAGING_LIBDIR}/libqpe.so.1.5.0 ${D}${palmtopdir}lib
 }
 
 PACKAGES = "libqpe1"
-FILES_libqpe1 = "/opt/QtPalmtop/lib"
+FILES_libqpe1 = "${palmtopdir}lib"
diff --git a/petitepainture/petitepainture_1.0.oe b/petitepainture/petitepainture_1.0.oe
index f74fb93247..3ef8ea69a7 100644
--- a/petitepainture/petitepainture_1.0.oe
+++ b/petitepainture/petitepainture_1.0.oe
@@ -13,9 +13,9 @@ inherit palmtop
 QMAKE_PROFILES = "spainter.pro"
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-        install -D -m 755 petitpeintu ${D}/opt/QtPalmtop/bin/petitpeintu
-        install -D -m 644 ${FILESDIR}/petitpeintu.desktop ${D}/opt/QtPalmtop/apps/Applications/petitpeintu.desktop
-        install -d ${D}/opt/QtPalmtop/pics
-        cp -a *.png ${D}/opt/QtPalmtop/pics/
+        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}apps/Applications/petitpeintu.desktop
+        install -d ${D}${palmtopdir}pics
+        cp -a *.png ${D}${palmtopdir}pics/
 }
diff --git a/phalanx/phalanx_22.oe b/phalanx/phalanx_22.oe
index c98011f819..00fd0af010 100644
--- a/phalanx/phalanx_22.oe
+++ b/phalanx/phalanx_22.oe
@@ -10,14 +10,14 @@ S = "${WORKDIR}/Phalanx-XXII"
 
 inherit autotools
 
-FILES_phalanx = "/opt/QtPalmtop/chess/engines/Phalanx"
+FILES_phalanx = "${palmtopdir}chess/engines/Phalanx"
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/chess/engines/Phalanx
-        install -D -m 755 phalanx ${D}/opt/QtPalmtop/chess/engines/Phalanx/phalanx
-        install -D -m 755 pbook.phalanx ${D}/opt/QtPalmtop/chess/engines/Phalanx/pbook.phalanx
-        >${D}/opt/QtPalmtop/chess/engines/Phalanx/sbook.phalanx
-        >${D}/opt/QtPalmtop/chess/engines/Phalanx/learn.phalanx
-        install -D -m 755 ${FILESDIR}/capabilities ${D}/opt/QtPalmtop/chess/engines/Phalanx/capabilities
-        install -D -m 755 ${FILESDIR}/description ${D}/opt/QtPalmtop/chess/engines/Phalanx/description
+	install -d ${D}${palmtopdir}chess/engines/Phalanx
+        install -D -m 755 phalanx ${D}${palmtopdir}chess/engines/Phalanx/phalanx
+        install -D -m 755 pbook.phalanx ${D}${palmtopdir}chess/engines/Phalanx/pbook.phalanx
+        >${D}${palmtopdir}chess/engines/Phalanx/sbook.phalanx
+        >${D}${palmtopdir}chess/engines/Phalanx/learn.phalanx
+        install -D -m 755 ${FILESDIR}/capabilities ${D}${palmtopdir}chess/engines/Phalanx/capabilities
+        install -D -m 755 ${FILESDIR}/description ${D}${palmtopdir}chess/engines/Phalanx/description
 }
diff --git a/pocketcellar/pocketcellar_1.1.oe b/pocketcellar/pocketcellar_1.1.oe
index 9a1ef31ab6..45afa1f2ce 100644
--- a/pocketcellar/pocketcellar_1.1.oe
+++ b/pocketcellar/pocketcellar_1.1.oe
@@ -14,13 +14,13 @@ inherit palmtop
 EXTRA_QMAKEVARS_POST = " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
+        install -d ${D}${palmtopdir}{bin,apps/Applications,pics}
 	install -d ${D}/home/root/Settings/
-	cp -a pkg-pcellar/home/QtPalmtop/* ${D}/opt/QtPalmtop/
+	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}/opt/QtPalmtop/bin/pocketcellar
-        install -D -m 644 pocketcellar.desktop ${D}/opt/QtPalmtop/apps/Applications/pocketcellar.desktop
-        cp pocketcellar.png ${D}/opt/QtPalmtop/pics/
+        install -D -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}bin/pocketcellar
+        install -D -m 644 pocketcellar.desktop ${D}${palmtopdir}apps/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 03150dd04c..66107926f0 100644
--- a/poqetpresenter/poqetpresenter_0.0.6.oe
+++ b/poqetpresenter/poqetpresenter_0.0.6.oe
@@ -16,9 +16,9 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-        install -D -m 0755 poqetp/poqetp ${D}/opt/QtPalmtop/bin/poqetp
-        install -D -m 0644 poqetp.desktop ${D}/opt/QtPalmtop/apps/Applications/poqetp.desktop
-        install -d ${D}/opt/QtPalmtop/pics/poqetp
-        cp -a pics/* ${D}/opt/QtPalmtop/pics/poqetp/
+        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}apps/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 831bdba7be..0e8b6bfdea 100644
--- a/prboom/prboom_2.3.0.oe
+++ b/prboom/prboom_2.3.0.oe
@@ -16,10 +16,10 @@ do_configure() {
 }
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics}
-	install -m 0755 src/prboom ${D}/opt/QtPalmtop/bin/prboom
-	install -m 0644 ${FILESDIR}/prboom.png ${D}/opt/QtPalmtop/pics/prboom.png
-	install -m 0644 ${FILESDIR}/prboom.desktop ${D}/opt/QtPalmtop/apps/Games/prboom.desktop
+	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}apps/Games/prboom.desktop
 }
 
-FILES_${PN} = "/opt/QtPalmtop"
+FILES_${PN} = "${palmtopdir}
diff --git a/puzz-le/puzz-le_2.0.0.oe b/puzz-le/puzz-le_2.0.0.oe
index 69b4e37a8f..d0485c2dca 100644
--- a/puzz-le/puzz-le_2.0.0.oe
+++ b/puzz-le/puzz-le_2.0.0.oe
@@ -13,7 +13,7 @@ S = "${WORKDIR}/puzzle_arm"
 inherit palmtop
 
 do_install() {
-        install -m 0755 puzz-le Qtopia/opt/QtPalmtop/bin/puzz-le
+        install -m 0755 puzz-le Qtopia${palmtopdir}bin/puzz-le
 	install -d ${D}/
 	cp -a Qtopia/* ${D}/
 }
diff --git a/qpegps/qpegps_0.9.2.oe b/qpegps/qpegps_0.9.2.oe
index ac7af484d0..5906249c7c 100644
--- a/qpegps/qpegps_0.9.2.oe
+++ b/qpegps/qpegps_0.9.2.oe
@@ -15,11 +15,11 @@ inherit palmtop
 QMAKE_PROFILES = "qpegps.pro"
 
 do_install() {
-        install -d ${D}/{opt/QtPalmtop/{help/html/qpegps_icons,bin,apps/Applications,pics/qpegps,qpegps/{maps,icons,tracks}}}
-        install -m 0755 qpegps ${D}/opt/QtPalmtop/bin/
-        install -m 0644 ${FILESDIR}/qpegps.desktop ${D}/opt/QtPalmtop/apps/Applications/
-        install -m 0644 ${FILESDIR}/qpegps.png ${D}/opt/QtPalmtop/pics/qpegps/
-        install -m 0644 doc/qpegps.html ${D}/opt/QtPalmtop/help/html/
-        install -m 0644 doc/qpegps_icons/*.png ${D}/opt/QtPalmtop/help/html/qpegps_icons/
-        install -m 0644 icons/*.xpm ${D}/opt/QtPalmtop/qpegps/icons/
+        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}apps/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 1f3203496e..51393cafec 100644
--- a/qplot/qplot_2.0.1cvs.oe
+++ b/qplot/qplot_2.0.1cvs.oe
@@ -13,12 +13,12 @@ S = "${WORKDIR}/qplot"
 inherit palmtop
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics,lib,plugins/inputmethods}
-        install -D -m 755 qplotmain/qplot ${D}/opt/QtPalmtop/bin/qplot
-        install -D -m 644 qplotmain/qplot.png ${D}/opt/QtPalmtop/pics/
-        install -D -m 644 qplotmain/qplot-const.b ${D}/opt/QtPalmtop/lib/
-        install -D -m 644 qplotmain/qplot-math.b ${D}/opt/QtPalmtop/lib/
-	oe_soinstall qplotmath/libqplotmath.so.1.0.0 ${D}/opt/QtPalmtop/plugins/inputmethods/
-        install -D -m 644 qplot.desktop ${D}/opt/QtPalmtop/apps/Applications/qplot.desktop
+        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}apps/Applications/qplot.desktop
 }
 
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index b2d4fc3af0..83cb24e4cf 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -62,13 +62,13 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/lib/fonts
-	oe_soinstall lib/libqte.so.${PV} ${D}/opt/QtPalmtop/lib
-	cp -a lib/fonts/* ${D}/opt/QtPalmtop/lib/fonts/
+	install -d ${D}${palmtopdir}lib/fonts
+	oe_soinstall lib/libqte.so.${PV} ${D}${palmtopdir}lib
+	cp -a lib/fonts/* ${D}${palmtopdir}lib/fonts/
 }
 
 PACKAGES = "libqte2 qte-fonts"
 
 FILES_${PN} = ""
-FILES_libqte2 = "/opt/QtPalmtop/lib/libqte.so*"
-FILES_qte-fonts = "/opt/QtPalmtop/lib/fonts"
+FILES_libqte2 = "${palmtopdir}lib/libqte.so*"
+FILES_qte-fonts = "${palmtopdir}lib/fonts"
diff --git a/sidplayer/sidplayer_1.5.0.oe b/sidplayer/sidplayer_1.5.0.oe
index 66a80d3dc2..3909e0e63d 100644
--- a/sidplayer/sidplayer_1.5.0.oe
+++ b/sidplayer/sidplayer_1.5.0.oe
@@ -15,6 +15,6 @@ EXTRA_QMAKEVARS_PRE = "QMAKE_INCDIR=${STAGING_INCDIR}/sidplay"
 inherit palmtop
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-	cp -a ../apps ../bin ../pics ${D}/opt/QtPalmtop/        
+        install -d ${D}${palmtopdir}{bin,apps/Applications,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 e69de29bb2..8b421f8e82 100644
--- a/subapplet/subapplet_1.0.7.oe
+++ b/subapplet/subapplet_1.0.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "A secondary system tray for those people who like having a lot of applets loaded at once."
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "libqpe1"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "http://www.hrw.one.pl/zaurus/subapplet-1.0.7-src.tar.gz \
+	   file://${FILESDIR}/subapplet.pro.patch;patch=1 \
+	   file://${FILESDIR}/about.ui.patch;patch=1"
+S = "${WORKDIR}/SubApplet-1.0.7"
+
+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/
+}
diff --git a/txdrug/txdrug_0.1.oe b/txdrug/txdrug_0.1.oe
index c604567bb2..77069bbcbe 100644
--- a/txdrug/txdrug_0.1.oe
+++ b/txdrug/txdrug_0.1.oe
@@ -14,5 +14,5 @@ inherit palmtop
 do_install() {
         install -d ${D}
 	cp -dfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${D}/$u/
-        install -D -m 755 txdrug ${D}/opt/QtPalmtop/bin/txdrug
+        install -D -m 755 txdrug ${D}${palmtopdir}bin/txdrug
 }
diff --git a/tximage/tximage_0.2.oe b/tximage/tximage_0.2.oe
index ed13f5397e..a90f2d1e6c 100644
--- a/tximage/tximage_0.2.oe
+++ b/tximage/tximage_0.2.oe
@@ -12,8 +12,8 @@ SRC_URI = "http://downloads.zaurususergroup.com/community/66.180.235.230/downloa
 inherit palmtop
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-        install -D -m 755 tximage ${D}/opt/QtPalmtop/bin/tximage
-        install -D -m 644 imageviewer.desktop ${D}/opt/QtPalmtop/apps/Applications/tximage.desktop
-        cp -a tximage.png ${D}/opt/QtPalmtop/pics/
+        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/
 }
diff --git a/vectoroids/vectoroids_1.1.0.oe b/vectoroids/vectoroids_1.1.0.oe
index d9911e8062..71b5c8cceb 100644
--- a/vectoroids/vectoroids_1.1.0.oe
+++ b/vectoroids/vectoroids_1.1.0.oe
@@ -17,15 +17,15 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics,share/vectoroids}
-        install -D -m 0755 vectoroids ${D}/opt/QtPalmtop/bin/vectoroids
-	install -D -m 0644 data/images/icon.png ${D}/opt/QtPalmtop/pics/vectoroids.png
-	cp -a data/* ${D}/opt/QtPalmtop/share/vectoroids
+        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
 
-	echo "[Desktop Entry]" >${D}/opt/QtPalmtop/apps/Games/vectoroids.desktop
-	echo "Comment=Asteroids game" >>${D}/opt/QtPalmtop/apps/Games/vectoroids.desktop
-	echo "Exec=vectoroids" >>${D}/opt/QtPalmtop/apps/Games/vectoroids.desktop
-	echo "Icon=vectoroids" >>${D}/opt/QtPalmtop/apps/Games/vectoroids.desktop
-	echo "Type=Application" >>${D}/opt/QtPalmtop/apps/Games/vectoroids.desktop
-	echo "Name=Vectoroids" >>${D}/opt/QtPalmtop/apps/Games/vectoroids.desktop
+	echo "[Desktop Entry]" >${D}${palmtopdir}apps/Games/vectoroids.desktop
+	echo "Comment=Asteroids game" >>${D}${palmtopdir}apps/Games/vectoroids.desktop
+	echo "Exec=vectoroids" >>${D}${palmtopdir}apps/Games/vectoroids.desktop
+	echo "Icon=vectoroids" >>${D}${palmtopdir}apps/Games/vectoroids.desktop
+	echo "Type=Application" >>${D}${palmtopdir}apps/Games/vectoroids.desktop
+	echo "Name=Vectoroids" >>${D}${palmtopdir}apps/Games/vectoroids.desktop
 }
diff --git a/wellenreiter/wellenreiter_20040228.oe b/wellenreiter/wellenreiter_20040228.oe
index 79c0af6af8..bc1b2f49d2 100644
--- a/wellenreiter/wellenreiter_20040228.oe
+++ b/wellenreiter/wellenreiter_20040228.oe
@@ -17,9 +17,9 @@ inherit palmtop
 EXTRA_QMAKEVARS_POST = "DEFINES+=OPIE_WE_VERSION=15"
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics/${PN}}
-	install -m 0755 ${OPIEDIR}/bin/${PN} ${D}/opt/QtPalmtop/bin/${PN}
-	install -m 0644 ${WORKDIR}/apps/Applications/${PN}.desktop ${D}/opt/QtPalmtop/apps/Applications/${PN}.desktop
-	install -m 0644 ${WORKDIR}/pics/${PN}/*.* ${D}/opt/QtPalmtop/pics/${PN}/
+	install -d ${D}${palmtopdir}{bin,apps/Applications,pics/${PN}}
+	install -m 0755 ${OPIEDIR}/bin/${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/zbench/zbench_2.0.oe b/zbench/zbench_2.0.oe
index fe330a498f..57cca680ae 100644
--- a/zbench/zbench_2.0.oe
+++ b/zbench/zbench_2.0.oe
@@ -11,8 +11,8 @@ SRC_URI = "http://www.vanille.de/mirror/zbench-${PV}.tar.bz2"
 inherit palmtop
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics}
-        install -D -m 755 zbench ${D}/opt/QtPalmtop/bin/zbench
-        install -D -m 644 zbench.desktop ${D}/opt/QtPalmtop/apps/Applications/zbench.desktop
-        cp zbench.png ${D}/opt/QtPalmtop/pics/
+        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}apps/Applications/zbench.desktop
+        cp zbench.png ${D}${palmtopdir}pics/
 }
diff --git a/zipsc/zipsc_0.4.3.oe b/zipsc/zipsc_0.4.3.oe
index 80f996dad8..31d0695409 100644
--- a/zipsc/zipsc_0.4.3.oe
+++ b/zipsc/zipsc_0.4.3.oe
@@ -13,7 +13,7 @@ S = "${WORKDIR}/zipsc_${PV}"
 inherit palmtop
 
 do_install() {
-        install -m 0755 zipsc Qtopia/opt/QtPalmtop/bin/zipsc
+        install -m 0755 zipsc Qtopia${palmtopdir}bin/zipsc
 	install -d ${D}/
 	cp -a Qtopia/* ${D}/
 }
diff --git a/zmerlin/zmerlin_0.9.1.oe b/zmerlin/zmerlin_0.9.1.oe
index be3f4d81be..e60f607cfa 100644
--- a/zmerlin/zmerlin_0.9.1.oe
+++ b/zmerlin/zmerlin_0.9.1.oe
@@ -12,8 +12,8 @@ S = "${WORKDIR}/zmerlin"
 inherit palmtop
 
 do_install() {
-        install -m 0755 zmerlin ${S}/ipk/opt/QtPalmtop/bin/zmerlin
-	install -d ${D}/opt/QtPalmtop
+        install -m 0755 zmerlin ${S}/ipk${palmtopdir}bin/zmerlin
+	install -d ${D}${palmtopdir}
         cp -a ipk/opt/* ${D}/opt
 }
 
diff --git a/zsafe/zsafe_2.1.2.oe b/zsafe/zsafe_2.1.2.oe
index ce04c14b84..93e44c71a3 100644
--- a/zsafe/zsafe_2.1.2.oe
+++ b/zsafe/zsafe_2.1.2.oe
@@ -15,9 +15,9 @@ inherit palmtop
 QMAKE_PROFILES = "zsafe.pro"
 
 do_install() {
-        install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics/zsafe}
-        install -D -m 0755 ${PN} ${D}/opt/QtPalmtop/bin/${PN}
-        install -D -m 0644 ${PN}.png ${D}/opt/QtPalmtop/pics/${PN}.png
-	cp -a pics/zsafe/*.xpm ${D}/opt/QtPalmtop/pics/zsafe
-	cp zsafe.desktop ${D}/opt/QtPalmtop/apps/Applications
+        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}apps/Applications
 }
diff --git a/ztappy/ztappy_0.9.1.oe b/ztappy/ztappy_0.9.1.oe
index 35348ce203..afb4443072 100644
--- a/ztappy/ztappy_0.9.1.oe
+++ b/ztappy/ztappy_0.9.1.oe
@@ -12,8 +12,8 @@ S = "${WORKDIR}/ztappy"
 inherit palmtop
 
 do_install() {
-        install -m 0755 ${PN} ${S}/ipk/opt/QtPalmtop/bin/${PN}
-	install -d ${D}/opt/QtPalmtop
+        install -m 0755 ${PN} ${S}/ipk${palmtopdir}bin/${PN}
+	install -d ${D}${palmtopdir}
         cp -a ipk/opt/* ${D}/opt
 }