/pidgin/main: 4d31fc6db752: Allow finch and libgnt to do introsp...

[Jorge Villase?or]

Changeset: 4d31fc6db752dc28e2c668ce7b26dc8779a21063
Author:	 Jorge Villase?or <salinasv at pidgin.im>
Date:	 2015-04-22 21:29 -0700
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/pidgin/main/rev/4d31fc6db752

Description:

Allow finch and libgnt to do introspection against non standard installations

diffstat:

 finch/Makefile.am        |  10 ++++++++--
 finch/libgnt/Makefile.am |  14 ++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs (66 lines):

diff --git a/finch/Makefile.am b/finch/Makefile.am
--- a/finch/Makefile.am
+++ b/finch/Makefile.am
@@ -126,10 +126,12 @@ if ENABLE_GNT
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
 	--warn-all \
+	--add-include-path=$(prefix)/share/gir-1.0 \
 	--add-include-path=$(builddir)/libgnt \
 	--add-include-path=$(top_builddir)/libpurple
 
 INTROSPECTION_COMPILER_ARGS = \
+	--includedir=$(prefix)/share/gir-1.0 \
 	--includedir=$(builddir)/libgnt \
 	--includedir=$(top_builddir)/libpurple
 
@@ -163,10 +165,14 @@ Finch_3_0_gir_LIBS = $(builddir)/libfinc
 Finch_3_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = \
+	 $(prefix)/share/gir-1.0 \
+	 $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
+typelibdir = \
+	$(prefix)/share/gir-1.0 \
+	$(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES = $(gir_DATA) $(typelib_DATA)
diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -113,8 +113,10 @@ AM_CPPFLAGS = \
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all
-INTROSPECTION_COMPILER_ARGS =
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(prefix)/share/gir-1.0 \
+	--warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(prefix)/share/gir-1.0
 
 if HAVE_INTROSPECTION
 introspection_sources = $(libgnt_lainclude_HEADERS)
@@ -133,10 +135,14 @@ Gnt_2_9_gir_LIBS = $(builddir)/libgnt.la
 Gnt_2_9_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Gnt-$(GNT_MAJOR_VERSION).$(GNT_MINOR_VERSION).gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = \
+	$(prefix)/share/gir-1.0 \
+	$(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
+typelibdir = \
+	$(prefix)/share/gir-1.0 \
+	$(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)