summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerry Hung <perry@leaflabs.com>2015-09-23 11:59:22 -0400
committerTim-Philipp Müller <tim@centricular.com>2015-09-29 13:13:02 +0100
commit3e4c521775c0f346aae2a22e69de09a57e72e3c0 (patch)
tree42b3e529d4254b212156fe119d970449e0476dbd
parente49c492a53ca637f3cec83987a317630370d3000 (diff)
downloadgstreamer-plugins-base-3e4c521775c0f346aae2a22e69de09a57e72e3c0.tar.gz
app: pass PKG_CONFIG_PATH for gir files for libgstapp as well
gir include search directories should respect PKG_CONFIG_PATH, just like we do everywhere else. Makes g-i pick up the right paths when using ./configure --with-pkg-config-path= https://bugzilla.gnome.org/show_bug.cgi?id=755494
-rw-r--r--gst-libs/gst/app/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 8f3bb59dc..6d6de8da3 100644
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -75,8 +75,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
$(INTROSPECTION_COMPILER) \
--includedir=$(srcdir) \
--includedir=$(builddir) \
- --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
- --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+ --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+ --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)