[oe-commits] org.oe.dev nunome: move to the new opie location

[polyonymous commit]

nunome: move to the new opie location

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: c59f113182d30217c5eb4faa825c9c3e18878a6b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c59f113182d30217c5eb4faa825c9c3e18878a6b
Files:
1
packages/nunome/nunome_1.0.2.bb
Diffs:

#
# mt diff -r3f2e7520ab3f744a48ff9b4c9f491edf215c23e4 -rc59f113182d30217c5eb4faa825c9c3e18878a6b
#
# 
# 
# patch "packages/nunome/nunome_1.0.2.bb"
#  from [e4b96a314bff3d24dc02a0d1de6b718adc10dece]
#    to [4e108210a865069507a587476dc0c0801a48e1bc]
# 
============================================================
--- packages/nunome/nunome_1.0.2.bb	e4b96a314bff3d24dc02a0d1de6b718adc10dece
+++ packages/nunome/nunome_1.0.2.bb	4e108210a865069507a587476dc0c0801a48e1bc
@@ -1,10 +1,10 @@ RDEPENDS = "virtual/japanese-font"
 DESCRIPTION = "Japanese input method plugin"
 HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
 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 @@ do_configure_prepend() {
 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_install() {
 
 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
 }