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



commit e39ba3d935128541a1461ebfc439feac89d54b0d
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 699b50e..acf3c62 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -223,10 +223,10 @@ Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
 INTROSPECTION_GIRS += Gdaui-5.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 dc4e277..866b6f0 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -357,10 +357,10 @@ Gda_5_0_gir_LIBS = $(lib_LTLIBRARIES)
 Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += Gda-5.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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]