nunome: move to the new opie location

diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb
index 0401c19..044ed13 100644 (file)
--- a/packages/nunome/nunome_1.0.2.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -4,7 +4,7 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "virtual/japanese-font"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
        file://timer.patch;patch=1 \
@@ -18,6 +18,8 @@ OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
 PARALLEL_MAKE = ""
 
 do_configure_prepend() {
+       sed -i -e 's,/opt/QtPalmtop/bin/,${bindir}/,g' "${S}/ui/nunome.h"
+       sed -i -e 's,/opt/QtPalmtop/,${palmtopdir}/,g' "${S}/ui/nunome.h"
        echo -e "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui" >nunome.pro
        pushd Nnmlib && qmake -project -t lib && popd
        pushd server && qmake -project && echo -e "LIBS+=-lNnmlib\nTARGET=server.bin" >> server.pro && popd
@@ -29,14 +31,14 @@ do_configure_prepend() {
 
 do_install() {
        install -d ${D}${palmtopdir}/lib
-       install -d ${D}${palmtopdir}/bin
+       install -d ${D}${bindir}
        install -d ${D}${palmtopdir}/i18n/ja
        install -d ${D}${palmtopdir}/share/nunome
 
        oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib
         install -m 644 nunome_uni.dic                  ${D}${palmtopdir}/share/nunome
-        install -m 755 server.bin              ${D}${palmtopdir}/bin/nnmsrv
-        install -m 755 dicman.bin              ${D}${palmtopdir}/bin/nnmDicman
+        install -m 755 server.bin              ${D}${bindir}/nnmsrv
+        install -m 755 dicman.bin              ${D}${bindir}/nnmDicman
         install -m 644 ui/nunome.qm            ${D}${palmtopdir}/i18n/ja
         install -m 644 dicman/nnmDicman.qm     ${D}${palmtopdir}/i18n/ja
 }