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
---
 freedroid/freedroid_1.0.2.oe | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'freedroid')

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