diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-05-26 20:55:26 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-05-26 20:55:26 +0900 |
| commit | 2578f47664361b1b4c48fa1c7c3d01ade53eb32f (patch) | |
| tree | e08c18e47ac5a82e5604d3053cfb056f4b37a8e9 /sphinx/quickstart.py | |
| parent | 08cfcbc363d684510dff3b2ed628a88a0e4d729a (diff) | |
| parent | 2c351a1261a5eb414f0e03a4aa811ee798f79819 (diff) | |
| download | sphinx-git-2578f47664361b1b4c48fa1c7c3d01ade53eb32f.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'sphinx/quickstart.py')
| -rw-r--r-- | sphinx/quickstart.py | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 5ee5cc7fe..eb54ca9cf 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -534,16 +534,6 @@ SPHINXBUILD = sphinx-build PAPER = BUILDDIR = %(rbuilddir)s -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -\t$(error \ -The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx \ -installed, then set the SPHINXBUILD environment variable to point \ -to the full path of the '$(SPHINXBUILD)' executable. Alternatively you \ -can add the directory with the executable to your PATH. \ -If you don\\'t have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter @@ -1077,16 +1067,6 @@ SPHINXPROJ = %(project_fn)s SOURCEDIR = %(rsrcdir)s BUILDDIR = %(rbuilddir)s -# User-friendly check for sphinx-build. -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error \ -The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx \ -installed, then set the SPHINXBUILD environment variable to point \ -to the full path of the '$(SPHINXBUILD)' executable. Alternatively you \ -can add the directory with the executable to your PATH. \ -If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - # Has to be explicit, otherwise we don't get "make" without targets right. help: \t@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) |