michaelh/zephyr
1
0
Fork 0
Code Releases Activity

doc: Makefile: Remove latex_paper_size (PAPER) option

Browse source 
This configuration variable was removed in Sphinx 1.6:
http://www.sphinx-doc.org/en/master/changes.html#id35. I suspect no one
might be using it. It could still be passed in SPHINXOPTS if needed.

Maybe the paper size should be set from Python instead:
http://www.sphinx-doc.org/en/master/usage/configuration.html

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2018-06-08 19:38:10 +02:00 • committed by Anas Nashif
commit a760c5b029
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/Makefile
View file

@ -1,10 +1,8 @@
# Makefile for Sphinx documentation # Makefile for Sphinx documentation
#
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS ?= -q SPHINXOPTS ?= -q
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR ?= _build BUILDDIR ?= _build
DOC_TAG ?= development DOC_TAG ?= development
@ -14,11 +12,9 @@ $(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx in
endif endif
# Internal variables. # Internal variables.
paperopt_a4 = -D latex_paper_size=a4 allsphinxopts = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
paperopt_letter = -D latex_paper_size=letter
allsphinxopts = -d $(BUILDDIR)/doctrees $(paperopt_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others # the i18n builder cannot share the environment and doctrees with the others
i18nsphinxopts = $(paperopt_$(PAPER)) $(SPHINXOPTS) . i18nsphinxopts = $(SPHINXOPTS) .
.PHONY: doxy help clean content kconfig html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext .PHONY: doxy help clean content kconfig html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
@ -37,7 +33,7 @@ help:
@echo " applehelp to make an Apple Help Book" @echo " applehelp to make an Apple Help Book"
@echo " devhelp to make HTML files and a Devhelp project" @echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub" @echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" @echo " latex to make LaTeX files"
@echo " latexpdf to make LaTeX files and run them through pdflatex" @echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " text to make text files" @echo " text to make text files"