Skip to content

Commit

Permalink
saw_031417_4 - Will just have to do without the friendly error check.
Browse files Browse the repository at this point in the history
  • Loading branch information
lannocc committed Mar 14, 2017
1 parent 099667f commit a9a8d38
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Copyright (C) 2017 Alpha Griffin
@%@~LICENSE~@%@

saw_031417_4 - Will just have to do without the friendly error check.

saw_031417_3 - Fix the conditional Sphinx check.

saw_031417_2 - Fix over-broad Sphinx dependency check.
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -122,27 +122,27 @@ docs_clean:
rm -rf $(DOCDIR)/coverage

# User-friendly check for sphinx-build
sphinx:
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
#sphinx:
#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

html: sphinx
html: #sphinx
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DOCDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(DOCDIR)/html."

text: sphinx
text: #sphinx
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(DOCDIR)/text
@echo
@echo "Build finished. The text files are in $(DOCDIR)/text."

man: sphinx
man: #sphinx
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCDIR)/man
@echo
@echo "Build finished. The manual pages are in $(DOCDIR)/man."

coverage: sphinx
coverage: #sphinx
$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(DOCDIR)/coverage
@echo "Testing of coverage in the sources finished, look at the " \
"results in $(DOCDIR)/coverage/python.txt."
Expand Down

0 comments on commit a9a8d38

Please sign in to comment.