diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-16 12:09:18 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-16 14:33:48 +0200 |
| commit | 770b4b5d0fac7944c5704bc8b54dfaf6021c0a20 (patch) | |
| tree | b8e51ebdf45b91ca0aad3b5d2faa46e2195433dd /recipes/navit | |
| parent | 102ef5fb54097727aa9a8cbf6dd9217c481bc066 (diff) | |
navit: add STAGING_DIR_NATIVE prefix to moc_location returned by pkg-config
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/navit')
| -rw-r--r-- | 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 0eb805b388..6f3e63e8c9 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() { |