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
---
 pocketcellar/pocketcellar_1.1.oe | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'pocketcellar/pocketcellar_1.1.oe')

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