Merge bk://openembedded@openembedded.bkbits.net/packages

into allanon.vanille.de:/usr/local/projects/oe-packages

2004/03/07 01:38:22+01:00 vanille.de!mickey
fix packaging of libqte and libqpe

BKrev: 404a6f08tRr5NSyI4GS25bFz4h7Umw

diff --git a/libqpe/libqpe-opie_1.0.3.oe b/libqpe/libqpe-opie_1.0.3.oe
index 1005623..896b164 100644 (file)
--- a/libqpe/libqpe-opie_1.0.3.oe
+++ b/libqpe/libqpe-opie_1.0.3.oe
@@ -52,7 +52,10 @@ do_stage() {
 }
 
 do_install() {
-       install -d ${D}/${prefix}/lib
-       oe_soinstall ${STAGING_LIBDIR}/libqpe.so.1.5.0 ${D}/${prefix}/lib
+       install -d ${D}/opt/QtPalmtop/lib
+       oe_soinstall ${STAGING_LIBDIR}/libqpe.so.1.5.0 ${D}/opt/QtPalmtop/lib
 }
 
+PACKAGES=libqpe1
+FILES_${PN}=
+FILES_libqpe1=/opt/QtPalmtop/lib

diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index cf644df..afcb24b 100644 (file)
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -55,13 +55,20 @@ do_compile() {
        oe_runmake
 }
 
-do_stage () {
+do_stage() {
        oe_soinstall lib/libqte.so.${PV} ${STAGING_LIBDIR}
        rm -f include/qxt.h
        cp -pfLR include/* ${STAGING_DIR}/target/include/
 }
 
-do_install () {
-       install -d ${D}${libdir}/qte2/lib
-       install -m 0755 lib/libqte.so.* ${D}${libdir}/qte2/lib/
+do_install() {
+       install -d ${D}/opt/QtPalmtop/lib/fonts
+       oe_soinstall lib/libqte.so.${PV} ${D}/opt/QtPalmtop/lib
+       cp -a lib/fonts/* ${D}/opt/QtPalmtop/lib/fonts/
 }
+
+PACKAGES=libqte2 qte-fonts
+
+FILES_${PN}=
+FILES_libqte2=/opt/QtPalmtop/lib/libqte.so*
+FILES_qte-fonts=/opt/QtPalmtop/lib/fonts