[grilo/0.1.x] build: Install .gir and .typelib files in the dirs reported by pkg-config

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit a8ecc3d820a42e6549c15c1226d57ba3a4447d54
Author: Alberto Garcia <agarcia igalia com>
Date:   Tue Apr 3 08:03:30 2012 +0000

    build: Install .gir and .typelib files in the dirs reported by pkg-config

 grilo-0.1.pc.in      |    4 ++--
 grilo-net-0.1.pc.in  |    4 ++--
 libs/net/Makefile.am |    4 ++--
 src/Makefile.am      |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/grilo-0.1.pc.in b/grilo-0.1.pc.in
index 34d7583..b51cb08 100644
--- a/grilo-0.1.pc.in
+++ b/grilo-0.1.pc.in
@@ -5,8 +5,8 @@ includedir= includedir@/@GRL_NAME@
 plugindir= GRL_PLUGINS_DIR@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
-girdir=${datadir}/gir-1.0
-typelibdir=${libdir}/girepository-1.0
+girdir= INTROSPECTION_GIRDIR@
+typelibdir= INTROSPECTION_TYPELIBDIR@
 
 Name: Grilo Framework
 Description: Grilo Framework for multimedia developers
diff --git a/grilo-net-0.1.pc.in b/grilo-net-0.1.pc.in
index a8f28a4..956c228 100644
--- a/grilo-net-0.1.pc.in
+++ b/grilo-net-0.1.pc.in
@@ -4,8 +4,8 @@ libdir= libdir@
 includedir= includedir@/@GRL_NAME@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
-girdir=${datadir}/gir-1.0
-typelibdir=${libdir}/girepository-1.0
+girdir= INTROSPECTION_GIRDIR@
+typelibdir= INTROSPECTION_TYPELIBDIR@
 
 Name: Grilo networking library
 Description: Grilo networking helpers for plug-ins
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am
index 5ec6c16..5414369 100644
--- a/libs/net/Makefile.am
+++ b/libs/net/Makefile.am
@@ -69,10 +69,10 @@ GrlNet_ GRL_MAJORMINOR_NORM@_gir_LIBS = libgrlnet- GRL_MAJORMINOR@.la
 GrlNet_ GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += GrlNet- GRL_MAJORMINOR@.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 += $(dist_gir_DATA) $(typelib_DATA)
diff --git a/src/Makefile.am b/src/Makefile.am
index f38fe6b..4393503 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,10 +135,10 @@ Grl_ GRL_MAJORMINOR_NORM@_gir_LIBS = lib GRL_NAME@.la
 Grl_ GRL_MAJORMINOR_NORM@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += Grl- GRL_MAJORMINOR@.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 += $(dist_gir_DATA) $(typelib_DATA)