avformat/subtitles: add a next line jumper and use it.

[ffmpeg] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index cd24b8c597edb35588b9f48d5643d09a4d33970c..74158997519d173a910c1acda67541a7a5fa39a1 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -88,8 +88,20 @@ $(DOCS) doc/doxy/html: | doc/
 doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
        $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
 
+install-doc: install-html install-man
+
+install-html:
+
 install-man:
 
+ifdef CONFIG_HTMLPAGES
+install-progs-$(CONFIG_DOC): install-html
+
+install-html: $(HTMLPAGES)
+       $(Q)mkdir -p "$(DOCDIR)"
+       $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
+endif
+
 ifdef CONFIG_MANPAGES
 install-progs-$(CONFIG_DOC): install-man
 
@@ -100,7 +112,12 @@ install-man: $(MANPAGES)
        $(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
 endif
 
-uninstall: uninstall-man
+uninstall: uninstall-doc
+
+uninstall-doc: uninstall-html uninstall-man
+
+uninstall-html:
+       $(RM) -r "$(DOCDIR)"
 
 uninstall-man:
        $(RM) $(addprefix "$(MANDIR)/man1/",$(MANPAGES1))