[libchamplain/libchamplain-0-4] 598942: Fix champlain-gtk GObject introspection

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit 4607df59c5b8c634525a947983f9d6debd13704a
Author: Koop Mast <kwm freebsd org>
Date:   Wed Oct 21 12:57:18 2009 -0400

    598942: Fix champlain-gtk GObject introspection

 AUTHORS                   |    1 +
 champlain-gtk/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index afd91dc..bad8eb1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,3 +26,4 @@ Vincent Untz <vuntz gnome org>
 Felix Riemann <friemann gnome org>
 Halton Huo <halton huo sun com>
 Bruce Cowan <bcowan fastmail co uk>
+Koop Mast <kwm freebsd org>
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 0cfd454..1674a84 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -47,7 +47,7 @@ GtkChamplain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.4.la
 	$(SOUP_CFLAGS) \
 	-I$(top_srcdir)			\
 	-DCHAMPLAIN_COMPILATION 	\
-	--add-include-path=$(builddir) \
+	--add-include-path=$(top_builddir)/champlain \
 	--c-include="$(libchamplain_include_HEADERS)" \
 	--include=Champlain-0.4 \
 	--include=Clutter-1.0 \
@@ -71,7 +71,7 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=$(top_builddir)/champlain $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif