aboutsummaryrefslogtreecommitdiff
path: root/Makefile.doc
diff options
context:
space:
mode:
authorJim Fehrle2018-08-21 15:10:59 -0700
committerJim Fehrle2018-08-29 12:46:51 -0700
commitcc35d211ad7550d23d64828c177936990c08d681 (patch)
tree34147c02b88d1e1bdd1d2687477776b98d9fa7e8 /Makefile.doc
parentbce734bfb2a118dbb487e5b88eba524ca14d2078 (diff)
Create SPHINXWARNERROR variable that controls whether the Sphinx
"treat errors as warnings" flag (-W) is applied. "1" or undefined includes the flag, other values or undefined omit it. Removed the "-warn-error" parameter to configure. "-profile XXX" will no longer cause these flags to be used.
Diffstat (limited to 'Makefile.doc')
-rw-r--r--Makefile.doc6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.doc b/Makefile.doc
index dde3a37b70..1b1198c1f2 100644
--- a/Makefile.doc
+++ b/Makefile.doc
@@ -33,6 +33,10 @@ HTMLSTYLE:=coqremote
# Sphinx-related variables
SPHINXENV:=COQBIN="$(CURDIR)/bin/"
SPHINXOPTS= -j4
+SPHINXWARNERROR ?= 1
+ifeq ($(SPHINXWARNERROR),1)
+SPHINXOPTS += -W
+endif
SPHINXBUILD= sphinx-build
SPHINXBUILDDIR= doc/sphinx/_build
@@ -56,7 +60,7 @@ endif
sphinx: $(SPHINX_DEPS)
$(SHOW)'SPHINXBUILD doc/sphinx'
- $(HIDE)$(SPHINXENV) $(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) doc/sphinx $(SPHINXBUILDDIR)/html
+ $(HIDE)$(SPHINXENV) $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) doc/sphinx $(SPHINXBUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(SPHINXBUILDDIR)/html."