Python #2465: don't create makefile if not prompted to do so.

This commit is contained in:
Georg Brandl 2008-03-23 17:33:50 +00:00
parent bf3e2cc208
commit 5dfd70d04d
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
Changes in trunk
================
* sphinx.quickstart: Really don't create a makefile if the user
doesn't want one.
Release 0.1.61798 (Mar 23, 2008)
================================

View File

@ -375,7 +375,8 @@ directly.'''
f.write(MASTER_FILE % d)
f.close()
if d['makefile']:
create_makefile = d['makefile'].upper() in ('Y', 'YES')
if create_makefile:
d['rsrcdir'] = separate and 'source' or '.'
d['rbuilddir'] = separate and 'build' or d['dot'] + 'build'
f = open(path.join(d['path'], 'Makefile'), 'w')
@ -387,7 +388,7 @@ directly.'''
print '''
You should now populate your master file %s and create other documentation
source files. Use the sphinx-build.py script to build the docs, like so:
''' % masterfile + (d['makefile'] and '''
''' % masterfile + (create_makefile and '''
make <builder>
''' or '''
sphinx-build.py -b <builder> %s %s