[oe] [PATCH 4/6] maliit-*-qt5: Adjust MKSPEC path

[Martin Jansa]

On Sat, Sep 28, 2013 at 11:25:17PM +0100, Stefan Schmidt wrote:
> ---
>  recipes-qt/maliit/maliit-framework-qt5_git.bb | 7 ++++---
>  recipes-qt/maliit/maliit-plugins-qt5_git.bb   | 1 +
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
> index 7b336ff..4f2da19 100644
> --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
> +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
> @@ -54,7 +54,7 @@ EXTRA_QMAKEVARS_PRE = "\
>      PREFIX=${prefix} \
>      LIBDIR=${libdir} \
>      QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \
> -    MALIIT_INSTALL_PRF=${datadir}/qt4/mkspecs/features \
> +    MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \
>      SCHEMADIR=${sysconfdir}/gconf/schemas \
>      CONFIG+=disable-gconf \
>      CONFIG+=disable-gtk-cache-update \
> @@ -68,8 +68,9 @@ EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
>  
>  do_install_append() {
>      #Fix absolute paths
> -    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-framework.prf
> -    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf
> +    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/usr/lib/qt5/mkspecs/features/maliit-framework.prf
> +    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/usr/lib/qt5/mkspecs/features/maliit-plugins.prf
> +    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/usr/lib/qt5/mkspecs/features/maliit-defines.prf

Why not use QMAKE_MKSPEC_PATH here as well?

>  
>      install -d ${D}${datadir}/applications
>      install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications
> diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb
> index 9d5b0e2..6b019ef 100644
> --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb
> +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb
> @@ -23,6 +23,7 @@ PV = "0.99.0+git${SRCPV}"
>  
>  EXTRA_QMAKEVARS_PRE = "\
>      PREFIX=${prefix} \
> +    MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \
>      LIBDIR=${libdir} \
>      CONFIG+=nodoc \
>  "
> -- 
> 1.8.4.rc3
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130929/2dd371eb/attachment-0002.sig>