From 1328a44a0190c9863c36c0b83052d8fc76886ebf Mon Sep 17 00:00:00 2001 From: David Waring Date: Tue, 2 Feb 2016 14:46:30 +0000 Subject: [PATCH] libs: player: use configured GST_PKG_CONFIG_PATH when invoking the introspection scanner https://bugzilla.gnome.org/show_bug.cgi?id=761460 --- gst-libs/gst/player/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/player/Makefile.am b/gst-libs/gst/player/Makefile.am index 4769fa85a7..611d1fc069 100644 --- a/gst-libs/gst/player/Makefile.am +++ b/gst-libs/gst/player/Makefile.am @@ -57,7 +57,8 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstplayer_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_API_VERSION@_la_SOURCES)) GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_VERSION@.la - $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v --namespace GstPlayer \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ + $(INTROSPECTION_SCANNER) -v --namespace GstPlayer \ --nsversion=@GST_API_VERSION@ \ --warn-all \ --strip-prefix=Gst \ @@ -65,7 +66,7 @@ GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_ -I$(top_builddir)/gst-libs \ --c-include "gst/player/player.h" \ --add-include-path=$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \ + --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-1.0` \ --library-path=$(top_builddir)/gst-libs \ --library=libgstplayer-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -91,10 +92,11 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(AM_V_GEN)$(INTROSPECTION_COMPILER) \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ + $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir)/gst-libs \ --includedir=$(builddir)/gst-libs \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \ + --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-1.0` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)