598942: Fix champlain-gtk GObject introspection

diff --git a/AUTHORS b/AUTHORS
index afd91dc938c6e9a113f8de537bca79e584b0ea54..bad8eb184b451d298780416f92ac04feefc28d9d 100644 (file)
--- 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 0cfd454ad3ad737225e08c45593fe6eac70c97cf..1674a842651a05eba1138579a13a17f458c86cca 100644 (file)
--- 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