[goocanvas] install introspection data to correct place. #731839

[Damon Chaplin <damon src gnome org>]

commit 0931a8fa0d09b5bd0e79580bdc3c2a060c58a3ae
Author: Damon Chaplin <Damon A Chaplin gmail com>
Date:   Thu Dec 15 11:45:34 2016 +0000

    install introspection data to correct place. #731839

 ChangeLog       |    6 ++++++
 configure.in    |    7 +++++++
 src/Makefile.am |    4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 70cac88..83136b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-15  Damon Chaplin  <damon localhost lan>
+
+       * configure.in:
+       * src/Makefile.am : patch from Alberto Garcia to install introspection
+       data to the correct place. #731839
+
 2016-12-15  Damon Chaplin  <damon gnome org>
 
        * src/*.c: removed use of <!--PARAMETERS--> gtk-doc flag which isn't
diff --git a/configure.in b/configure.in
index 5f5d1d1..f18944d 100644
--- a/configure.in
+++ b/configure.in
@@ -50,6 +50,13 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 AC_SUBST(GLIB_MKENUMS)
 
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
+if test "x$found_introspection" = "xyes"; then
+   INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=prefix='${prefix}' --variable=girdir 
gobject-introspection-1.0`
+   AC_SUBST(INTROSPECTION_GIRDIR)
+
+   INTROSPECTION_TYPELIBDIR=`$PKG_CONFIG --define-variable=prefix='${prefix}' --variable=typelibdir 
gobject-introspection-1.0`
+   AC_SUBST(INTROSPECTION_TYPELIBDIR)
+fi
 
 AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--disable-rebuilds],
diff --git a/src/Makefile.am b/src/Makefile.am
index 1abf2d5..e23079e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,10 +162,10 @@ GooCanvas_2_0_gir_LIBS = goocanvas-2.0
 GooCanvas_2_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += GooCanvas-2.0.gir
 
-girdir = $(datadir)/gir-1.0
+girdir = @INTROSPECTION_GIRDIR@
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(libdir)/girepository-1.0
+typelibdir = @INTROSPECTION_TYPELIBDIR@
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)