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

diff --git a/libopie/libopie2/include.pro b/libopie/libopie2/include.pro
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index 9a47d9c..e875609 100644 (file)
--- 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 52181f6..4632039 100644 (file)
--- 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}/
 }