[oe-commits] Paul Eggleton : zmerlin: fix do_install

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5903d69cb914e46951b6db47d37b06de570a53dc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5903d69cb914e46951b6db47d37b06de570a53dc

Author: Paul Eggleton <bluelightning at bluelightning.org>
Date:   Tue Nov 18 23:34:59 2008 +0000

zmerlin: fix do_install

---

 packages/zmerlin/zmerlin_0.9.1.bb |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb
index 43e94a5..186fdcf 100644
--- a/packages/zmerlin/zmerlin_0.9.1.bb
+++ b/packages/zmerlin/zmerlin_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
 SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://user.cs.tu-berlin.de/~karlb/zmerlin/zmerlin.tar.gz"
 S = "${WORKDIR}/zmerlin"
@@ -10,8 +10,11 @@ S = "${WORKDIR}/zmerlin"
 inherit palmtop
 
 do_install() {
-        install -m 0755 zmerlin ${S}/ipk${palmtopdir}/bin/zmerlin
-	install -d ${D}${palmtopdir}/
-        cp -pPR ipk/opt/* ${D}/opt
+        install -d ${D}${palmtopdir}/bin \
+                   ${D}${palmtopdir}/apps/Games \
+                   ${D}${palmtopdir}/pics/zmerlin
+        install -m 0755 zmerlin ${D}${palmtopdir}/bin/
+        install -m 0644 ipk/opt/QtPalmtop/apps/Games/zmerlin.desktop ${D}${palmtopdir}/apps/Games/
+        install -m 0644 ipk/opt/QtPalmtop/pics/zmerlin/*.png ${D}${palmtopdir}/pics/zmerlin/
 }