[libgda/LIBGDA_4.2] GI: Use INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR to use system configuration for correct in

[Vivien Malerba <vivien src gnome org>]

commit a57532c1f139ef8028209871ca55c5166ce55ae7
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu May 19 11:33:45 2011 -0500

    GI: Use INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR to use system configuration for correct installation

 libgda-ui/Makefile.am |    4 ++--
 libgda/Makefile.am    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index f1abb39..b1511ef 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -223,10 +223,10 @@ Gdaui_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
 INTROSPECTION_GIRS += Gdaui-4.0.gir
 
-girdir = $(datadir)/gir-1.0
+girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(libdir)/girepository-1.0/
+typelibsdir = $(INTROSPECTION_TYPELIBDIR)
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA)
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index fd37f6f..4fa2a1e 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -361,10 +361,10 @@ Gda_4_0_gir_LIBS = $(lib_LTLIBRARIES)
 Gda_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += Gda-4.0.gir
 
-girdir = $(datadir)/gir-1.0
+girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(libdir)/girepository-1.0
+typelibsdir = $(INTROSPECTION_TYPELIBDIR)
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA)
 endif