[gtk-vnc] Fix GIR generation

[Christophe Fergeau <teuf src gnome org>]

commit 4875bf01b17d82ec4c10b4097bc63178e82bc0d0
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Tue Nov 29 12:49:07 2011 +0100

    Fix GIR generation
    
    Overriding PKG_CONFIG_PATH when generating GtkVnc-2.0.gir is
    wrong since this means that if glib/... is installed in a prefix that
    is not one of the default pkg-config paths, then it won't be found.
    PKG_CONFIG_PATH is overridden so that g-ir-scanner can find GVnc-1.0.gir
    in the build tree. Since g-ir-scanner provides --include-uninstalled
    for that purpose, use that instead.

 src/Makefile.am |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 2313ede..1643b07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -355,7 +355,7 @@ PREFIX_ARGS = --strip-prefix=Vnc
 endif
 
 GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am
-	$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
+	$(AM_V_GEN)$(G_IR_SCANNER) \
                 --namespace GVnc \
                 --nsversion 1.0 \
 		--include GObject-2.0 \
@@ -369,7 +369,7 @@ GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am
                 -I$(top_srcdir) \
                 -I$(srcdir) \
 		--verbose \
-                --pkg=gvnc-1.0 \
+                --pkg-export=gvnc-1.0 \
                 $(GVNC_INTROSPECTION_SRCS)
 
 GVncPulse-1.0.gir: libgvncpulse-1.0.la $(G_IR_SCANNER) Makefile.am
@@ -392,12 +392,12 @@ GVncPulse-1.0.gir: libgvncpulse-1.0.la $(G_IR_SCANNER) Makefile.am
                 $(GVNCPULSE_INTROSPECTION_SRCS)
 
 GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION).la $(G_IR_SCANNER) Makefile.am
-	$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
+	$(AM_V_GEN)$(G_IR_SCANNER) \
                 --namespace GtkVnc \
                 --nsversion $(GTK_VNC_API_VERSION) \
 		--include GObject-2.0 \
 		--include Gtk-$(GTK_API_VERSION) \
-		--include GVnc-1.0 \
+		--include-uninstalled $(builddir)/GVnc-1.0.gir \
 		$(PREFIX_ARGS) \
                 --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
                 --add-include-path=$(top_srcdir) \
@@ -408,7 +408,7 @@ GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION
                 -I$(top_srcdir) \
                 -I$(srcdir) \
 		--verbose \
-                --pkg=gtk-vnc-$(GTK_VNC_API_VERSION) \
+                --pkg-export=gtk-vnc-$(GTK_VNC_API_VERSION) \
                 $(GTK_VNC_INTROSPECTION_SRCS)
 
 girdir = $(datadir)/gir-1.0