gir-repository r161 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Mon Oct 27 11:20:32 2008
New Revision: 161
URL: http://svn.gnome.org/viewvc/gir-repository?rev=161&view=rev

Log:
use typelibdir from gobject-introspection-1.0.pc

Modified:
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:20:32 2008
@@ -31,6 +31,9 @@
 GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 AC_SUBST(GIRDIR)
 
+TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+AC_SUBST(TYPELIBDIR)
+
 m4_define(pango_required_version,      1.16.0)
 m4_define(atk_required_version,        1.12.0)
 m4_define(gtk_required_version,        2.8.0)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 27 11:20:32 2008
@@ -649,7 +649,7 @@
 girdir = $(GIRDIR)
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)
 
-typelibsdir = $(libdir)/girepository
+typelibsdir = $(TYPELIBDIR)
 typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
 
 TXML = $(dist_gir_DATA:.gir=.gir.txml)