diff options
| author | WAKAYAMA Shirou <shirou.faw@gmail.com> | 2014-10-02 21:45:02 +0900 |
|---|---|---|
| committer | WAKAYAMA Shirou <shirou.faw@gmail.com> | 2014-10-02 21:45:02 +0900 |
| commit | 1cdfb7b69f8dedce4c53c63cd8ca067fec9f17e9 (patch) | |
| tree | 408ce71e4cecc676f83e51f313d989cd96d983a3 | |
| parent | b781df3ba487eaca8e71c8f1b908816846c6a698 (diff) | |
| parent | f9c3a2356797f130c924dce150fc7098669ac8e3 (diff) | |
| download | sphinx-1cdfb7b69f8dedce4c53c63cd8ca067fec9f17e9.tar.gz | |
merge
| -rw-r--r-- | sphinx/quickstart.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 51110871..c37fa109 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -1480,6 +1480,10 @@ def main(argv=sys.argv): d2.update(dict(("ext_"+ext, False) for ext in EXTENSIONS)) d2.update(d) d = d2 + if 'no_makefile' in d: + d['makefile'] = False + if 'no_batchfile' in d: + d['batchfile'] = False else: ask_user(d) except (KeyboardInterrupt, EOFError): |