Merge

[vuplus_openembedded] / pocketcellar / pocketcellar_1.1.oe

diff --git a/pocketcellar/pocketcellar_1.1.oe b/pocketcellar/pocketcellar_1.1.oe
index 72b7038..67e508a 100644 (file)
--- 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} = "/"