gtk-doc*.mak: Put the API version in the html book name

This causes devhelp2 files to get a version. Due to that devhelp can show it
along with the 0.10 version.

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index f69d9d7..f19e7d7 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -222,10 +222,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
            mkhtml_options="$$mkhtml_options --verbose"; \
          fi; \
        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_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
-       @rm -f html/index.sgml.bak
+       cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_API_VERSION@ $(DOC_MAIN_SGML_FILE)
        @rm -f html/$(DOC_MAIN_SGML_FILE)
        @rm -rf html/xml
        @rm -f html/version.entities
@@ -289,9 +286,9 @@ install-data-local:
              $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
            done; \
          fi; \
-         echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
-         if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
-                   $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
+         echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2' ; \
+         if test -e $(builddir)/html/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; then \
+                   $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2 \
                    $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
          fi; \
          $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 17cee71..9d76889 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -130,10 +130,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        if test "$(?)" = "0"; then \
          mkhtml_options=--path="$(abs_srcdir)"; \
        fi; \
-       cd html && gtkdoc-mkhtml $$mkhtml_options $(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_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
-       @rm -f html/index.sgml.bak
+       cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_API_VERSION@ ../$(DOC_MAIN_SGML_FILE)
        @rm -rf html/xml
        @rm -f version.entities
        @test "x$(HTML_IMAGES)" = "x" ||  ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html )
@@ -189,9 +186,9 @@ install-data-local:
            echo '-- Installing '$$i ; \
            $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
          done; \
-         echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
-         if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
-                   $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
+         echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2' ; \
+         if test -e $(builddir)/html/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; then \
+                   $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2 \
                    $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
          fi; \
          $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \