doc/en/Makefile: use Sphinx's make mode #6873
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
blueyed
added
type: docs
bluetech
approved these changes
Mar 7, 2020
There was a problem hiding this comment.
IIUC this is regenerating the file from sphinx-quickstart of newer sphinx. It looks good to me except two trivial diffs I noticed.
I also noticed sphinx-quickstart generates a make.bat file which doesn't exit in pytest. Maybe worth adding for the benefit of developers on Windows. Or maybe not...
doc/en/Makefile
Outdated
| # | ||
|
|
||
| # You can set these variables from the command line. | ||
| SPHINXOPTS = |
There was a problem hiding this comment.
Suggested change
| SPHINXOPTS = | |
| SPHINXOPTS ?= |
doc/en/Makefile
Outdated
|
|
||
| # You can set these variables from the command line. | ||
| SPHINXOPTS = | ||
| SPHINXBUILD = sphinx-build |
There was a problem hiding this comment.
Suggested change
| SPHINXBUILD = sphinx-build | |
| SPHINXBUILD ?= sphinx-build |
|
It was synced with/from Sphinx' own |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.