[couchdb-glib] Changed couchdb-glib/Makefile.am to use /gir-1.0 and /girepository-1.0 instead of INTROSPECTION_TYPE

[Rodrigo Moya <rodrigo src gnome org>]

commit 003c16c6d8d4a857bf9ff23d8177fe5a8531cb4f
Author: Krzysztof Klimonda <kklimonda ubuntu com>
Date:   Fri Aug 27 21:00:17 2010 +0200

    Changed couchdb-glib/Makefile.am to use /gir-1.0 and /girepository-1.0 instead of INTROSPECTION_TYPELIBDIR

 Makefile.am                   |    2 +-
 configure.ac                  |    7 ---
 couchdb-glib/Makefile.am      |    4 +-
 desktopcouch-glib/Makefile.am |    4 +-
 m4/introspection.m4           |   92 -----------------------------------------
 5 files changed, 5 insertions(+), 104 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index df87a74..9b2f556 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = couchdb-glib desktopcouch-glib tests bindings doc
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
 pcfiles = couchdb-glib-1.0.pc desktopcouch-glib-1.0.pc
 
diff --git a/configure.ac b/configure.ac
index 9f412c6..67b0e51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,13 +96,6 @@ AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 ##################################################
 GOBJECT_INTROSPECTION_CHECK([0.6.4])
 
-# There seems to be a bug somewhere that makes INTROSPECTION_MAKEFILE not being defined ??
-if test "x$INTROSPECTION_MAKEFILE" = "x"
-then
-   INTROSPECTION_MAKEFILE="`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection"
-   AC_SUBST(INTROSPECTION_MAKEFILE)
-fi
-
 AC_OUTPUT([
 Makefile
 couchdb-glib.pc
diff --git a/couchdb-glib/Makefile.am b/couchdb-glib/Makefile.am
index 845dff1..6eec82c 100644
--- a/couchdb-glib/Makefile.am
+++ b/couchdb-glib/Makefile.am
@@ -108,10 +108,10 @@ Couchdb_1_0_gir_LIBS = libcouchdb-glib-1.0.la
 Couchdb_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
 INTROSPECTION_GIRS += Couchdb-1.0.gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
diff --git a/desktopcouch-glib/Makefile.am b/desktopcouch-glib/Makefile.am
index 050e2b9..b4de45c 100644
--- a/desktopcouch-glib/Makefile.am
+++ b/desktopcouch-glib/Makefile.am
@@ -44,10 +44,10 @@ Desktopcouch_1_0_gir_LIBS = libdesktopcouch-glib-1.0.la
 Desktopcouch_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
 INTROSPECTION_GIRS += Desktopcouch-1.0.gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)