IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

quickstart: simplify the check for the "sphinx-build" command in the Makefile

Browse Source 
The previous check called the "sphinx-build" executable on every invocation
of the Makefile, which takes a nontrivial time to import all required modules.
Calling "which" is much faster.
This commit is contained in:
Georg Brandl 2013-03-29 11:17:04 +01:00
parent e30b1325ef
commit 663599abe9
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sphinx/quickstart.py
View File

@ -389,19 +389,14 @@ SPHINXBUILD = sphinx-build
PAPER = PAPER =
BUILDDIR = %(rbuilddir)s BUILDDIR = %(rbuilddir)s
ifeq ($(shell $(SPHINXBUILD) 2> /dev/null; echo $$?), 127) # User-friendly check for sphinx-build
define MSG ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error \
The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx \
The 'sphinx-build' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point \
installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you \
to the full path of the 'sphinx-build' executable. Alternatively you can add the directory with the executable to your PATH. \
may add the Sphinx directory to PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
If you don't have Sphinx installed, grab it from
http://sphinx-doc.org/
endef
$(error $(MSG))
endif endif
# Internal variables. # Internal variables.