Merge pull request MrKiven#20 from MrKiven/fix_make_doc_error

Fix build error
turbo2025 · Jun 7, 2016 · 43926b2 · 43926b2
2 parents 6f05e88 + 2e96731
commit 43926b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,3 @@
+doc:
+	make -C docs html
+
diff --git a/Readme.rst b/Readme.rst
@@ -32,7 +32,7 @@ Online: https://pyzh.readthedocs.org/en/latest/
       cd PyZh
       git submodule init & git submodule update
       virtualenv venv
-      source <env-path>/bin/activate 
+      source <env-path>/bin/activate
       pip install -r requirements.pip
 
 2. 编写文章::
@@ -41,8 +41,7 @@ Online: https://pyzh.readthedocs.org/en/latest/
 
 3. 编译预览::
 
-      cd docs
-      make html
+      make doc
       cd _build/html
       python -m SimpleHTTPServer
 

diff --git a/docs/Makefile b/docs/Makefile
@@ -7,6 +7,11 @@ SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
 
+# 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
+
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter

diff --git a/requirements.pip b/requirements.pip
@@ -3,7 +3,7 @@ Jinja2==2.6
 Pygments==1.6
 Sphinx==1.2b1
 docutils==0.10
--e git://github.com/veselosky/sphinx-feed.git@0acfe8c73c0fbc5d889ba8cc2ee8f135b6ca673c#egg=feed-dev
+-e git://github.com/whardier/sphinx-feed.git#egg=feed-dev
 html5lib==0.95
 python-dateutil==2.1
 six==1.3.0