From a7254eb5476121971a4f3ecf1f3167df2764d24a Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Mon, 28 Feb 2005 20:35:42 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/28 11:18:28+00:00 nexus.co.uk!pb
add airo-cs to HANDHELD_MODULES

2005/02/28 11:17:56+01:00 handhelds.org!CoreDump
Adjust opie-pics_1.1.9.bb to work with the new inline folder

BKrev: 4223809eCh97ctdV-hzxJELAJ8fiIg
---
 packages/opie-pics/opie-pics_1.1.9.bb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'packages')

diff --git a/packages/opie-pics/opie-pics_1.1.9.bb b/packages/opie-pics/opie-pics_1.1.9.bb
index 56f42087f8..3537159bdc 100644
--- a/packages/opie-pics/opie-pics_1.1.9.bb
+++ b/packages/opie-pics/opie-pics_1.1.9.bb
@@ -3,21 +3,33 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};module=opie/pics;tag=${TAG}"
-S = "${WORKDIR}/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics;tag=${TAG} \
+	   ${HANDHELDS_CVS};module=opie/pics-hires;tag=${TAG}"
+
+S = "${WORKDIR}"
+
+SHIP_INLINE_PICS = "yes"
+INLINE_PICS = "pics/inline"
+INLINE_PICS_tosa = "pics-hires/inline"
+INLINE_PICS_c7x0 = "pics-hires/inline"
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/addressbook/
 	install -d ${D}${palmtopdir}/pics/datebook/
 	install -d ${D}${palmtopdir}/pics/todo/
-	install -m 0664 *.png ${D}${palmtopdir}/pics/
-	install -m 0664 addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
-	install -m 0664 datebook/*.png ${D}${palmtopdir}/pics/datebook/
-	install -m 0664 todo/*.png ${D}${palmtopdir}/pics/todo/	
-	
+	install -m 0664 pics/*.png ${D}${palmtopdir}/pics/
+	install -m 0664 pics/addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+	install -m 0664 pics/datebook/*.png ${D}${palmtopdir}/pics/datebook/
+	install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/	
+
+	if [ "${SHIP_INLINE_PICS}" == "yes" ]; then
+		install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/
+	fi
 }
 
 FILES_${PN} = "${palmtopdir}"
+PACKAGE_ARCH = "${MACHINE}"
+
-- 
cgit v1.2.3