From a94229318f7fc480c79279bb3f604a11ddf8f2f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 15 Jan 2013 12:54:20 +0000 Subject: [PATCH] gtk-doc*.mak: use _1_0 suffix for plugin and registry environment The _1_0 variables override the generic ones without suffix. If we are in an environment that sets _1_0 variables, such as jhbuild, we don't want those overriding our unsuffixed build-specific variables here. --- gtk-doc-plugins.mak | 6 +++--- gtk-doc.mak | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index 2468cb0..f69d9d7 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -94,9 +94,9 @@ all-local: html-build.stamp INSPECT_REGISTRY=$(top_builddir)/docs/plugins/inspect-registry.xml INSPECT_ENVIRONMENT=\ LC_ALL=C \ - GST_PLUGIN_SYSTEM_PATH= \ - GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(top_builddir)/plugins:$(top_builddir)/src:$(top_builddir)/gnl \ - GST_REGISTRY=$(INSPECT_REGISTRY) \ + GST_PLUGIN_SYSTEM_PATH_1_0= \ + GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(top_builddir)/plugins:$(top_builddir)/src:$(top_builddir)/gnl \ + GST_REGISTRY_1_0=$(INSPECT_REGISTRY) \ PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INSPECT_EXTRA_ENVIRONMENT) diff --git a/gtk-doc.mak b/gtk-doc.mak index a1e07dc..17cee71 100644 --- a/gtk-doc.mak +++ b/gtk-doc.mak @@ -81,9 +81,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) --ignore-headers="$(IGNORE_HFILES)" @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null; then \ echo " DOC Introspecting gobjects"; \ - GST_PLUGIN_SYSTEM_PATH=`cd $(top_builddir) && pwd` \ - GST_PLUGIN_PATH= \ - GST_REGISTRY=doc-registry.xml \ + GST_PLUGIN_SYSTEM_PATH_1_0=`cd $(top_builddir) && pwd` \ + GST_PLUGIN_PATH_1_0= \ + GST_REGISTRY_1_0=doc-registry.xml \ $(GTKDOC_EXTRA_ENVIRONMENT) \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" \ CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \ -- 2.7.4