summaryrefslogtreecommitdiff
path: root/m4/introspection.m4
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2015-02-22 11:16:54 -0500
committerColin Walters <walters@verbum.org>2015-02-22 11:16:54 -0500
commit43917708b8b40e5794f7d78d7b9abb2e1d6664cb (patch)
treeb0bb570a55ebac97b9e3a632591fe311e38c8d9e /m4/introspection.m4
parenta16797f96b7af171a3cba70d6ffc107f5e4ba2a0 (diff)
downloadgobject-introspection-43917708b8b40e5794f7d78d7b9abb2e1d6664cb.tar.gz
Revert "Install typelib and girfiles following the package's --prefix"
This reverts commit a16797f96b7af171a3cba70d6ffc107f5e4ba2a0.
Diffstat (limited to 'm4/introspection.m4')
-rw-r--r--m4/introspection.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index 356964fd..d89c3d90 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 --define-variable="datadir=${datadir}" gobject-introspection-1.0`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir --define-variable="libdir=${libdir}" 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_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