summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bigonville <bigon@bigon.be>2018-02-01 16:13:33 +0100
committerOlivier CrĂȘte <olivier.crete@collabora.com>2018-02-23 15:38:24 -0500
commit5bcf5578a70f16f87c595560b0793e208b823c6c (patch)
tree36ff81500416231f872f87b099263d60efb878af
parent6c3ded360addb03c75634adb521526f23028a85b (diff)
downloadfarstream-5bcf5578a70f16f87c595560b0793e208b823c6c.tar.gz
Fix the name of the generated .devhelp2 files
https://bugs.freedesktop.org/show_bug.cgi?id=104903
-rw-r--r--common-modified/gtk-doc-plugins.mak2
-rw-r--r--common-modified/gtk-doc.mak2
2 files changed, 2 insertions, 2 deletions
diff --git a/common-modified/gtk-doc-plugins.mak b/common-modified/gtk-doc-plugins.mak
index 82dbad46..a50107f0 100644
--- a/common-modified/gtk-doc-plugins.mak
+++ b/common-modified/gtk-doc-plugins.mak
@@ -212,7 +212,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)-@GST_API_VERSION@ $(DOC_MAIN_SGML_FILE)
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
@rm -f html/$(DOC_MAIN_SGML_FILE)
@rm -rf html/xml
@rm -f html/version.entities
diff --git a/common-modified/gtk-doc.mak b/common-modified/gtk-doc.mak
index 37542ec2..7caeb8bf 100644
--- a/common-modified/gtk-doc.mak
+++ b/common-modified/gtk-doc.mak
@@ -147,7 +147,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)-@GST_API_VERSION@ ../$(DOC_MAIN_SGML_FILE)
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(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 )