Commits

georg.brandl  committed 3bd0cf1

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

  • Participants
  • Parent commits c23cb13

Comments (0)

Files changed (2)

+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)
 ================================
 

File sphinx/quickstart.py

     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')
     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