From a95139783dc27e863dd588cb260c27415e43e1a9 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Mon, 27 Dec 2004 19:40:08 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
bkbits.net:/repos/n/nslu2-linux/openembedded
2004/12/27 19:08:24+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe
2004/12/27 20:08:50+01:00 handhelds.org!zecke
Fix Compilation of libopie:
Install private pim headers into staging include directory to allow compilation
2004/12/27 19:07:16+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe
2004/12/27 19:05:52+00:00 nexus.co.uk!pb
minimo.png is also in ${WORKDIR}, not ${S}
2004/12/27 19:55:50+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded
2004/12/27 19:55:41+01:00 handhelds.org!CoreDump
opie-backgammon: fix packaging of pics and binary
2004/12/27 18:53:14+00:00 nexus.co.uk!pb
minimo.desktop is in ${WORKDIR}, not ${S}
BKrev: 41d06518xh9jnVevYfiiB9bpSgdmDA
---
packages/mozilla/minimo_cvs.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'packages/mozilla')
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 5f5b6bb651..6f7f8ae637 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -62,9 +62,9 @@ do_install () {
cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/
rm -f ${mozdir}/TestGtkEmbed
mkdir -p ${D}/${datadir}/applications
- install -m 0644 ${S}/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
+ install -m 0644 ${WORKDIR}/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
mkdir -p ${D}/${datadir}/pixmaps
- install -m 0644 ${S}/minimo.png ${D}/${datadir}/pixmaps/minimo.png
+ install -m 0644 ${WORKDIR}/minimo.png ${D}/${datadir}/pixmaps/minimo.png
mkdir -p ${D}/${bindir}
echo "#!/bin/sh" > ${D}/${bindir}/minimo
cat >>${D}/${bindir}/minimo << EOF
--
cgit v1.2.3