[gobject-introspection] Revert "Install typelib and girfiles following the package's --prefix"
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Revert "Install typelib and girfiles following the package's --prefix"
- Date: Sun, 22 Feb 2015 16:17:13 +0000 (UTC)
commit 43917708b8b40e5794f7d78d7b9abb2e1d6664cb
Author: Colin Walters <walters verbum org>
Date: Sun Feb 22 11:16:54 2015 -0500
Revert "Install typelib and girfiles following the package's --prefix"
This reverts commit a16797f96b7af171a3cba70d6ffc107f5e4ba2a0.
m4/introspection.m4 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index 356964f..d89c3d9 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]