From 5dfd70d04df7344749ed50543f43ce53e95e9d64 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 23 Mar 2008 17:33:50 +0000
Subject: [PATCH] Python #2465: don't create makefile if not prompted to do so.

---
 CHANGES              | 6 ++++++
 sphinx/quickstart.py | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e2330c31e..a211f7ae4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
 ================================
 
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 5f74e4280..8302a2218 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -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