merge 3.4

This commit is contained in:
Benjamin Peterson 2014-12-10 11:05:35 -05:00
commit 649e1f141a
1 changed files with 1 additions and 1 deletions

View File

@ -8,7 +8,7 @@ PYTHON = python
SPHINXBUILD = sphinx-build
PAPER =
SOURCES =
DISTVERSION = $(shell $(PYTHON) tools/patchlevel.py)
DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py)
ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \
$(SPHINXOPTS) . build/$(BUILDER) $(SOURCES)