libqpe-opie: Use $libdir.

* Also, remove remnants of build-time overrides (now is handled in rntime).
* Per #2254.

diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 292a29f..2218734 100644 (file)
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -16,14 +16,6 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
 EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
 
 CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-#CXXFLAGS_append_c7x0 =  " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_tosa =  " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
-
-do_compile_prepend_mnci () {
-       ln -s custom-ramses.h custom.h
-}
 
 do_compile() {
         mkdir -p ${STAGING_INCDIR}/qpe \
@@ -53,9 +45,9 @@ do_stage() {
 }
 
 do_install() {
-       oe_libinstall -so libqpe ${D}${palmtopdir}/lib
+       oe_libinstall -so libqpe ${D}${libdir}
 
-    install -d ${D}${includedir}/qpe \
+        install -d ${D}${includedir}/qpe \
                ${D}${includedir}/qtopia/private
 
        for i in ${S}/*.h
@@ -72,8 +64,3 @@ do_install() {
        done
        rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
 }
-
-FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
-FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*.so"
-FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
-#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"

diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index a91ccfc..f206529 100644 (file)
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \