]> Pileus Git - ~andy/gtk/commitdiff
introspection.m4: Update from g-i
authorColin Walters <walters@verbum.org>
Wed, 22 Jun 2011 15:07:37 +0000 (11:07 -0400)
committerColin Walters <walters@verbum.org>
Wed, 22 Jun 2011 15:07:37 +0000 (11:07 -0400)
This fixes substitution with dash.

m4/introspection.m4

index 91b905139b4a9fe4b70a3ff83fb1924012def7ab..589721c5a02008e3b32e3978e6b201d6f4c6cb92 100644 (file)
@@ -58,9 +58,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
        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_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
        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