Merge pull request #2848 from sphinx-doc/use_make-mode_by_default

Use make-mode of ``sphinx-quickstart`` by default
This commit is contained in:
Takeshi KOMIYA 2016-08-13 12:49:16 +09:00 committed by GitHub
commit 63d2330b8f
2 changed files with 3 additions and 0 deletions

View File

@ -39,6 +39,8 @@ Incompatible changes
* Fix :download: role on epub/qthelp builder. They ignore the role because they don't support it.
* ``sphinx.ext.viewcode`` doesn't work on epub building by default. ``viewcode_enable_epub`` option
* ``sphinx.ext.viewcode`` disabled on singlehtml builder.
* Use make-mode of ``sphinx-quickstart`` by default. To disable this, use
``-M`` option
Features added
--------------

View File

@ -585,6 +585,7 @@ def main(argv=sys.argv):
group.add_option('-M', '--no-use-make-mode', action='store_false', dest='make_mode',
help='not use make-mode for Makefile/make.bat')
group.add_option('-m', '--use-make-mode', action='store_true', dest='make_mode',
default=True,
help='use make-mode for Makefile/make.bat')
# parse options