[Python-checkins] cpython (2.7): Issue #27896: Allow passing sphinx options to Doc/Makefile

[victor.stinner]

https://hg.python.org/cpython/rev/3b22c99535d0
changeset:   104535:3b22c99535d0
branch:      2.7
parent:      104514:7dd0910e8fbf
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Oct 16 19:14:23 2016 +0200
summary:
  Issue #27896: Allow passing sphinx options to Doc/Makefile

Patch written by Julien Palard.

files:
  Doc/Makefile |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -157,12 +157,12 @@
 
 # for development releases: always build
 autobuild-dev:
-	make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1'
+	make dist SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
 	-make suspicious
 
 # for quick rebuilds (HTML only)
 autobuild-dev-html:
-	make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
+	make html SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
 # release candidate downloads are okay, since the stable tree can be in that stage

-- 
Repository URL: https://hg.python.org/cpython