[oe-commits] org.oe.dev libqpe-opie: Use $libdir.

[pfalcon commit]

libqpe-opie: Use $libdir.
* Also, remove remnants of build-time overrides (now is handled in rntime).
* Per #2254.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e46e8d44edb8ec6813496fffd6f48f105aecbd82
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e46e8d44edb8ec6813496fffd6f48f105aecbd82
Files:
1
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
Diffs:

#
# mt diff -rb49b7578a03c13ee53eb6cf4a424182c427b7a0b -re46e8d44edb8ec6813496fffd6f48f105aecbd82
#
# 
# 
# patch "packages/libqpe/libqpe-opie.inc"
#  from [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
#    to [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
# 
# patch "packages/libqpe/libqpe-opie_cvs.bb"
#  from [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
#    to [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
# 
============================================================
--- packages/libqpe/libqpe-opie.inc	3346fde77506aea54b8d7d57c5fe1dcae017a6ca
+++ packages/libqpe/libqpe-opie.inc	c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3
@@ -16,15 +16,7 @@ CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT
 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 \
                  ${STAGING_INCDIR}/qtopia \
@@ -53,9 +45,9 @@ do_install() {
 }
 
 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}"
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb	f96cc1aefe160f38dd0536ab17ca7a8896d39937
+++ packages/libqpe/libqpe-opie_cvs.bb	66eb84a06f4f226608fdaccbcc077ac5fb2e540e
@@ -1,7 +1,7 @@ PV = "1.2.2+cvs${SRCDATE}"
 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 \