From 210df3ce941d17ac9c0602a9f36c55328c6f5503 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 20 Apr 2004 03:11:30 +0000
Subject: 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
---
 billiardz/billiardz_0.1.4.oe | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'billiardz')

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
 }
-- 
cgit v1.2.3