diff options
author | Jani Nikula <jani.nikula@intel.com> | 2016-05-28 15:25:41 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-05-30 13:38:53 +0300 |
commit | c13ce448c8532965eb4e1115e78cb5b8ff8261a3 (patch) | |
tree | 9045c881acf6badba6f0d32572cd0f845d33c8e9 /Documentation/Makefile.sphinx | |
parent | 24dcdeb28b55afafa9cdf6acedd78cf1aa8f8428 (diff) | |
download | op-kernel-dev-c13ce448c8532965eb4e1115e78cb5b8ff8261a3.zip op-kernel-dev-c13ce448c8532965eb4e1115e78cb5b8ff8261a3.tar.gz |
Documentation/sphinx: set version and release properly
Read the version and release from the top level Makefile (for use when
Sphinx is invoked directly, by e.g. Read the Docs), but override them
via Sphinx command line arguments in a normal documentation build.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'Documentation/Makefile.sphinx')
-rw-r--r-- | Documentation/Makefile.sphinx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index 8a662be..addf323 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -27,7 +27,7 @@ PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter KERNELDOC = $(srctree)/scripts/kernel-doc KERNELDOC_CONF = -D kerneldoc_srctree=$(srctree) -D kerneldoc_bin=$(KERNELDOC) -ALLSPHINXOPTS = -d $(BUILDDIR)/.doctrees $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) -c $(srctree)/$(src) $(SPHINXOPTS) $(srctree)/$(src) +ALLSPHINXOPTS = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(BUILDDIR)/.doctrees $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) -c $(srctree)/$(src) $(SPHINXOPTS) $(srctree)/$(src) # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . |