[oe-commits] Martin Jansa : navit: add STAGING_DIR_NATIVE prefix to moc_location returned by pkg-config

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 770b4b5d0fac7944c5704bc8b54dfaf6021c0a20
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=770b4b5d0fac7944c5704bc8b54dfaf6021c0a20

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jun 16 12:09:18 2010 +0200

navit: add STAGING_DIR_NATIVE prefix to moc_location returned by pkg-config

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/navit/navit.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 0eb805b..6f3e63e 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -9,7 +9,7 @@ RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${P
 RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
 
 PE = "1"
-INC_PR = "r7"
+INC_PR = "r8"
 
 inherit autotools
 
@@ -72,6 +72,8 @@ FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_ar
 do_configure_prepend() {
   #Remove xpm building, replaced by icons in own package
   sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am
+  # MOC=`$PKG_CONFIG QtGui --variable=moc_location` returns only /usr/bin/moc4 which is not available on hosts without Qt
+  sed -i "s#MOC=#MOC=${STAGING_DIR_NATIVE}#g" ${S}/configure.in
 }
 
 do_install_append() {