aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-04-23 19:58:30 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-04-23 19:58:30 +0000
commit69079013455c574f1a5abb3dc470f7d80f2f349c (patch)
treeebc0d28cf513dfe0a9e16414a18f48dac3bbcbb2
parent4cee67d2b20da1a36de74bcf63259fe4d88b8322 (diff)
downloadopenembedded-69079013455c574f1a5abb3dc470f7d80f2f349c.tar.gz
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/04/23 21:55:30+02:00 uni-frankfurt.de!mickey catch up with opie.oeclass 2004/04/23 21:46:41+02:00 uni-frankfurt.de!mickey use a common include.pro file to deal with opie quicklaunch vs. non-quicklaunch BKrev: 40897566Cckc0ZT_4s2vS_b1fo2bLg
-rw-r--r--libopie/libopie2/include.pro0
-rw-r--r--libopie/libopie2_cvs.oe6
-rw-r--r--wellenreiter/wellenreiter_cvs.oe5
3 files changed, 7 insertions, 4 deletions
diff --git a/libopie/libopie2/include.pro b/libopie/libopie2/include.pro
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libopie/libopie2/include.pro
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index 9a47d9c57d..e875609e00 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -36,10 +36,14 @@ do_compile() {
oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
}
-# no staging neessary, becaue
+# no sophisticated staging neessary, because
# include files already done during do_compile
# lib files already done during do_compile
+do_stage() {
+ install -m 0644 ${FILESDIR}/include.pro ${OPIEDIR}/
+}
+
do_install() {
install -d ${D}${palmtopdir}/lib/
oe_soinstall ${STAGING_LIBDIR}/libopiecore2.so.1.9.1 ${D}${palmtopdir}/lib/
diff --git a/wellenreiter/wellenreiter_cvs.oe b/wellenreiter/wellenreiter_cvs.oe
index 52181f658f..46320392c1 100644
--- a/wellenreiter/wellenreiter_cvs.oe
+++ b/wellenreiter/wellenreiter_cvs.oe
@@ -12,12 +12,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/w
S = "${WORKDIR}/wellenreiter"
inherit opie
+APPTYPE = "binary"
do_install() {
install -d ${D}/${palmtopdir}/apps/Applications \
- ${D}/${palmtopdir}/pics/wellenreiter \
- ${D}/${palmtopdir}/bin
- install -m 0755 ${PN} ${D}${palmtopdir}/bin/${PN}
+ ${D}/${palmtopdir}/pics/wellenreiter
install -m 0644 ${WORKDIR}/apps/Applications/${PN}.desktop ${D}${palmtopdir}/apps/Applications/${PN}.desktop
install -m 0644 ${WORKDIR}/pics/${PN}/*.* ${D}${palmtopdir}/pics/${PN}/
}