summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-01-17 15:53:03 -0500
committerColin Walters <walters@verbum.org>2015-02-20 10:15:01 -0500
commita16797f96b7af171a3cba70d6ffc107f5e4ba2a0 (patch)
tree4d36a9ce7f6534204c8aa30bb7dc3317fb9884fb
parentdec574dfdeb971736003738696f09c40b7911c64 (diff)
downloadgobject-introspection-a16797f96b7af171a3cba70d6ffc107f5e4ba2a0.tar.gz
Install typelib and girfiles following the package's --prefix
https://bugzilla.gnome.org/show_bug.cgi?id=639782
-rw-r--r--m4/introspection.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index d89c3d90..356964fd 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -59,8 +59,8 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir --define-variable="datadir=${datadir}" gobject-introspection-1.0`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir --define-variable="libdir=${libdir}" gobject-introspection-1.0)"
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection