[goffice] compilation: fix for distcheck

[Morten Welinder <mortenw src gnome org>]

commit 82fc91fb9ee6d8a534a62bf8a76f15653c13e75c
Author: Morten Welinder <terra gnome org>
Date:   Fri Apr 20 20:34:33 2012 -0400

    compilation: fix for distcheck
    
    Install introspection stuff to $prefix, even if that is not where gir
    wants it.

 configure.in        |    6 ------
 goffice/Makefile.am |    6 ++++--
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1a7a2ce..9952e3a 100644
--- a/configure.in
+++ b/configure.in
@@ -657,20 +657,14 @@ AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection)
 G_IR_SCANNER=
 G_IR_COMPILER=
 G_IR_GENERATE=
-GIRDIR=
-TYPELIBDIR=
 if $have_introspection; then
    G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
    G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
    G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-   GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-   TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 fi
 AC_SUBST(G_IR_SCANNER)
 AC_SUBST(G_IR_COMPILER)
 AC_SUBST(G_IR_GENERATE)
-AC_SUBST(GIRDIR)
-AC_SUBST(TYPELIBDIR)
 
 dnl ******************
 dnl * Config defaults
diff --git a/goffice/Makefile.am b/goffice/Makefile.am
index 302a26b..f1ce62d 100644
--- a/goffice/Makefile.am
+++ b/goffice/Makefile.am
@@ -162,12 +162,14 @@ GOffice- GOFFICE_API_VER@.gir: $(G_IR_SCANNER)
 
 if HAVE_INTROSPECTION
 
-girdir = $(GIRDIR)
+girdir = $(datadir)/gir-1.0
 gir_DATA = $(BUILT_GIRSOURCES)
 
-typelibsdir = $(TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+
 %.typelib: %.gir $(G_IR_COMPILER)
 	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F)