/dev/masca/gplugin: 23c53d383697: Allow pidgin and libpurple to ...

[Jorge Villase?or]

Changeset: 23c53d383697ae93bb29dcd3c1efd34d9457fa7f
Author:	 Jorge Villase?or <salinasv at pidgin.im>
Date:	 2015-03-01 18:46 -0800
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/dev/masca/gplugin/rev/23c53d383697

Description:

Allow pidgin and libpurple to do introspection agains non standard install dir.

diffstat:

 libpurple/Makefile.am |  8 ++++----
 pidgin/Makefile.am    |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (54 lines):

diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -454,8 +454,8 @@ 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 = \
@@ -498,10 +498,10 @@ Purple_3_0_gir_LIBS = $(builddir)/libpur
 Purple_3_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Purple-$(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/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -264,8 +264,8 @@ DISTCLEANFILES = $(DESKTOP_FILE)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple --includedir=$(prefix)/share/gir-1.0
 
 if HAVE_INTROSPECTION
 introspection_sources = $(libpidgininclude_HEADERS)
@@ -300,10 +300,10 @@ Pidgin_3_0_gir_LIBS = $(builddir)/libpid
 Pidgin_3_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Pidgin-$(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)