From bd7c28f471ebcee877f05ac5321aa06696affd5d Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 3 Sep 2018 01:36:18 +0900
Subject: [PATCH] Fix #5127: quickstart: ``Makefile`` and ``make.bat`` are not
 overwritten if exists

---
 CHANGES                  | 1 +
 sphinx/cmd/quickstart.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 80d657998..499eca094 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ Incompatible changes
 
 * #5282: html theme: refer ``pygments_style`` settings of HTML themes
   preferentially
+* #5127: quickstart: ``Makefile`` and ``make.bat`` are not overwritten if exists
 
 Deprecated
 ----------
diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py
index 0cb2350c6..174298579 100644
--- a/sphinx/cmd/quickstart.py
+++ b/sphinx/cmd/quickstart.py
@@ -678,7 +678,7 @@ def main(argv=sys.argv[1:]):
         except ValueError:
             print(__('Invalid template variable: %s') % variable)
 
-    generate(d, templatedir=args.templatedir)
+    generate(d, overwrite=False, templatedir=args.templatedir)
     return 0