gtk-doc*.mak: use _1_0 suffix for plugin and registry environment

[platform/upstream/gst-common.git] / gtk-doc-plugins.mak

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 8cc42e7..f69d9d7 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -13,8 +13,7 @@ help:
        @echo
 
 # update the stuff maintained by doc maintainers
-update:
-       $(MAKE) scanobj-update
+update: scanobj-update
        $(MAKE) check-outdated-docs
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -25,7 +24,7 @@ update:
 GPATH = $(srcdir)
 
 # thomas: make docs parallel installable
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_API_VERSION@
 
 MAINTAINER_DOC_STAMPS =                        \
        scanobj-build.stamp
@@ -95,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)
 
@@ -130,7 +129,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
            --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) &&          \
            echo "  DOC   Merging introspection data" && \
            $(PYTHON)                                           \
-           $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE);       \
+           $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1;     \
        if test x"$(srcdir)" != x. ; then                               \
            for f in $(SCANOBJ_FILES);                                  \
            do                                                          \
@@ -225,7 +224,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        fi; \
        cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
        @mv html/index.sgml html/index.sgml.bak
-       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
+       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
        @rm -f html/index.sgml.bak
        @rm -f html/$(DOC_MAIN_SGML_FILE)
        @rm -rf html/xml
@@ -293,10 +292,9 @@ install-data-local:
          echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
          if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
                    $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
          fi; \
-         (which gtkdoc-rebase >/dev/null && \
-           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
+         $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
        fi)
 uninstall-local:
        if test -d $(DESTDIR)$(TARGET_DIR); then \