[gnome-games/gnome-3-0] libgames-support: Install typelib into a private location, don't bother installing the .gir since th

[Jason Clinton <jclinton src gnome org>]

commit 876dac3aebd11d280b252ebf398c554565fa6261
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Mar 30 16:49:18 2011 +1100

    libgames-support: Install typelib into a private location, don't bother installing the .gir since the library is private and is not going to be extended by other libraries

 libgames-support/Makefile.am |   11 +----------
 lightsoff/src/lightsoff.in   |    1 +
 swell-foop/swell-foop.in     |    1 +
 3 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index fa96061..ec7744d 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -199,9 +199,6 @@ libgames_support_gi_la_LIBADD = $(libgames_support_la_LIBADD)
 
 BUILT_GIRSOURCES = GnomeGamesSupport-1.0.gir
 
-# FIXMEchpe: change GIR version for the gtk+-3.0 based one...
-# or just remove introspection support for the gtk+-2.0 build
-
 GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(libgames_support_gi_la_SOURCES)
 	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v \
 	--namespace GnomeGamesSupport --nsversion=1.0 \
@@ -222,13 +219,7 @@ GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(lib
 	-I$(top_builddir) \
 	$(filter games%,$^)
 
-# FIXMEchpe: this looks bogus. If the introspection.m4 macro gets it wrong, fix it!
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0
+typelibsdir = $(pkglibdir)
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
diff --git a/lightsoff/src/lightsoff.in b/lightsoff/src/lightsoff.in
index daff9e5..976e1db 100644
--- a/lightsoff/src/lightsoff.in
+++ b/lightsoff/src/lightsoff.in
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 
 export LD_LIBRARY_PATH="%pkglibdir%${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export GI_TYPELIB_PATH="%pkglibdir%${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 /usr/bin/env seed %pkgdatadir%/lightsoff/main.js
diff --git a/swell-foop/swell-foop.in b/swell-foop/swell-foop.in
index ccfca41..5129a5e 100644
--- a/swell-foop/swell-foop.in
+++ b/swell-foop/swell-foop.in
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 
 export LD_LIBRARY_PATH="%pkglibdir%${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export GI_TYPELIB_PATH="%pkglibdir%${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 /usr/bin/env seed %pkgdatadir%/swell-foop/main.js