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

Merge pull request #2936 from shibukawa/fix/doc-makefile

Browse Source 
Fix doc/Makefile that can't build man because of doc/man folder exists
This commit is contained in:
Takeshi KOMIYA 2016-10-14 11:55:54 +09:00 committed by GitHub
commit cb5e09ffe1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -4,6 +4,8 @@ Release 1.4.9 (in development)
Bugs fixed Bugs fixed
---------- ----------
* #2936: Fix doc/Makefile that can't build man because doc/man exists
Release 1.4.8 (released Oct 1, 2016) Release 1.4.8 (released Oct 1, 2016)
==================================== ====================================

4
doc/Makefile
View File

@ -1,3 +1,4 @@
.PHONY: man
# Makefile for Sphinx documentation # Makefile for Sphinx documentation
# #
@ -12,6 +13,9 @@ BUILDDIR = _build
help: help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
man:
@$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
# Catch-all target: route all unknown targets to Sphinx using the new # Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: %: