From 9c2d4f5308d38bd9129095a605639720fdedd907 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 24 Sep 2019 17:13:58 +0200 Subject: [PATCH] switch opt-out NOVIEW to opt-in PVE_DOC_INSTANTVIEW As we had to set NOVIEW _everywhere_, which is a good sign that opt-in is much better suited than opt out. Especially as one can point the browser or man to the resulting build documentation html file or manpage once and then hit just reload after a re-build, which is almost zero effort. Signed-off-by: Thomas Lamprecht --- Makefile | 2 +- pve-doc-generator.mk.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b373066..6eb2639 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ README.html: README.adoc .PHONY: index index: index.html - $(BROWSER) index.html & + test -n "$${PVE_DOC_INSTANTVIEW}" && $(BROWSER) index.html & chapter-index-table.adoc: asciidoc-pve ./asciidoc-pve chapter-table >$@.tmp diff --git a/pve-doc-generator.mk.in b/pve-doc-generator.mk.in index d0be25a..6073728 100644 --- a/pve-doc-generator.mk.in +++ b/pve-doc-generator.mk.in @@ -76,21 +76,21 @@ chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES} %.1: %.adoc %.1-synopsis.adoc ${PVE_COMMON_DOC_SOURCES} ${ASCIIDOC_PVE} compile-man -o $@ $*.adoc - test -n "$${NOVIEW}" || man -l $@ + test -n "$${PVE_DOC_INSTANTVIEW}" && man -l $@ %.1.html: %.adoc %.1-synopsis.adoc ${PVE_COMMON_DOC_SOURCES} ${ASCIIDOC_PVE} compile-man-html -o $@ $*.adoc %.8: %.adoc %.8-synopsis.adoc ${PVE_COMMON_DOC_SOURCES} ${ASCIIDOC_PVE} compile-man -o $@ $*.adoc - test -n "$${NOVIEW}" || man -l $@ + test -n "$${PVE_DOC_INSTANTVIEW}" && man -l $@ %.8.html: %.adoc %.8-synopsis.adoc ${PVE_COMMON_DOC_SOURCES} ${ASCIIDOC_PVE} compile-man-html -o $@ $*.adoc %.5: %.adoc %.5-opts.adoc ${PVE_COMMON_DOC_SOURCES} ${ASCIIDOC_PVE} compile-man -o $@ $*.adoc - test -n "$${NOVIEW}" || man -l $@ + test -n "$${PVE_DOC_INSTANTVIEW}" && man -l $@ %.5.html: %.adoc %.5-opts.adoc ${PVE_COMMON_DOC_SOURCES} ${ASCIIDOC_PVE} compile-man-html -o $@ $*.adoc