2c48c2f
diff -ru gst-plugins-good-0.10.31/common/gtk-doc.mak gst-plugins-good-0.10.31.docbook/common/gtk-doc.mak
2c48c2f
--- gst-plugins-good-0.10.31/common/gtk-doc.mak	2011-12-30 14:59:21.000000000 +0100
2c48c2f
+++ gst-plugins-good-0.10.31.docbook/common/gtk-doc.mak	2016-12-06 14:06:06.953785693 +0100
2c48c2f
@@ -130,10 +130,7 @@
2c48c2f
 	if test "$(?)" = "0"; then \
2c48c2f
 	  mkhtml_options=--path="$(abs_srcdir)"; \
2c48c2f
 	fi; \
2c48c2f
-	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
2c48c2f
-	@mv html/index.sgml html/index.sgml.bak
2c48c2f
-	@$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
2c48c2f
-	@rm -f html/index.sgml.bak
2c48c2f
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_MAJORMINOR@ ../$(DOC_MAIN_SGML_FILE)
2c48c2f
 	@rm -rf html/xml
2c48c2f
 	@rm -f version.entities
2c48c2f
 	@test "x$(HTML_IMAGES)" = "x" ||  ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html )
2c48c2f
@@ -189,9 +186,9 @@
2c48c2f
 	    echo '-- Installing '$$i ; \
2c48c2f
 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
2c48c2f
 	  done; \
2c48c2f
-	  echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
2c48c2f
-	  if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
2c48c2f
-	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
2c48c2f
+	  echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
2c48c2f
+	  if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
2c48c2f
+	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
2c48c2f
 	            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
2c48c2f
 	  fi; \
2c48c2f
 	  (which gtkdoc-rebase >/dev/null && \
2c48c2f
diff -ru gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak gst-plugins-good-0.10.31.docbook/common/gtk-doc-plugins.mak
2c48c2f
--- gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak	2011-12-30 14:59:21.000000000 +0100
2c48c2f
+++ gst-plugins-good-0.10.31.docbook/common/gtk-doc-plugins.mak	2016-12-06 14:06:55.123696984 +0100
2c48c2f
@@ -223,10 +223,7 @@
2c48c2f
 	    mkhtml_options="$$mkhtml_options --verbose"; \
2c48c2f
 	  fi; \
2c48c2f
 	fi; \
2c48c2f
-	cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
2c48c2f
-	@mv html/index.sgml html/index.sgml.bak
2c48c2f
-	@$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
2c48c2f
-	@rm -f html/index.sgml.bak
2c48c2f
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
2c48c2f
 	@rm -f html/$(DOC_MAIN_SGML_FILE)
2c48c2f
 	@rm -rf html/xml
2c48c2f
 	@rm -f html/version.entities
2c48c2f
@@ -290,9 +287,9 @@
2c48c2f
 	      $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
2c48c2f
 	    done; \
2c48c2f
 	  fi; \
2c48c2f
-	  echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
2c48c2f
-	  if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
2c48c2f
-	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
2c48c2f
+	  echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
2c48c2f
+	  if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
2c48c2f
+	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
2c48c2f
 	            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
2c48c2f
 	  fi; \
2c48c2f
 	  (which gtkdoc-rebase >/dev/null && \
2c48c2f
diff -ru gst-plugins-good-0.10.31/docs/plugins/Makefile.in gst-plugins-good-0.10.31.docbook/docs/plugins/Makefile.in
2c48c2f
--- gst-plugins-good-0.10.31/docs/plugins/Makefile.in	2012-02-21 01:08:52.000000000 +0100
2c48c2f
+++ gst-plugins-good-0.10.31.docbook/docs/plugins/Makefile.in	2016-12-06 14:08:18.480812994 +0100
2c48c2f
@@ -1153,10 +1153,7 @@
2c48c2f
 @ENABLE_GTK_DOC_TRUE@	    mkhtml_options="$$mkhtml_options --verbose"; \
2c48c2f
 @ENABLE_GTK_DOC_TRUE@	  fi; \
2c48c2f
 @ENABLE_GTK_DOC_TRUE@	fi; \
2c48c2f
-@ENABLE_GTK_DOC_TRUE@	cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
2c48c2f
-@ENABLE_GTK_DOC_TRUE@	@mv html/index.sgml html/index.sgml.bak
2c48c2f
-@ENABLE_GTK_DOC_TRUE@	@$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
2c48c2f
-@ENABLE_GTK_DOC_TRUE@	@rm -f html/index.sgml.bak
2c48c2f
+@ENABLE_GTK_DOC_TRUE@	cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
2c48c2f
 @ENABLE_GTK_DOC_TRUE@	@rm -f html/$(DOC_MAIN_SGML_FILE)
2c48c2f
 @ENABLE_GTK_DOC_TRUE@	@rm -rf html/xml
2c48c2f
 @ENABLE_GTK_DOC_TRUE@	@rm -f html/version.entities
2c48c2f
@@ -1216,9 +1213,9 @@
2c48c2f
 	      $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
2c48c2f
 	    done; \
2c48c2f
 	  fi; \
2c48c2f
-	  echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
2c48c2f
-	  if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
2c48c2f
-	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
2c48c2f
+	  echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
2c48c2f
+	  if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
2c48c2f
+	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
2c48c2f
 	            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
2c48c2f
 	  fi; \
2c48c2f
 	  (which gtkdoc-rebase >/dev/null && \