python-pygtk: Use correct paths at build time

Fix the paths in configure.ac to use the target libraries and generators for
building pygtk. Fix taken from OE.

Thanks to Gary Thomas for providing a first stab at this.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
index ef63b51038809664e28dd8db7e908851df1a2ffe..3dcfd64a9db67aec8e9920eb36192c4277fe29f8 100644 (file)
--- a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
+++ b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
@@ -6,7 +6,7 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml8.2"
+PR = "ml8.3"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch \
@@ -21,6 +21,14 @@ inherit autotools pkgconfig distutils-base
 
 do_configure_prepend() {
        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+       sed -i \
+               -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \
+               -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \
+               -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \
+               -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \
+               -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \
+               ${S}/configure.ac
+       sed -i 's:tests docs:tests:' Makefile.am
 }
 
 # dirty fix #1: remove dependency on python-pygobject-dev