From b5bae235f2033ca0c732e3401d463193f29d6866 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Fri, 16 Feb 2018 01:52:51 +0900
Subject: [PATCH] Fix #4615: The argument of ``sphinx.build`` has been changed
 in 1.7.0

---
 CHANGES              | 1 +
 sphinx/__init__.py   | 9 +++++----
 sphinx/apidoc.py     | 1 +
 sphinx/quickstart.py | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1b7aa967d..538a44a4f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ Bugs fixed
 * #4260: autodoc: keyword only argument separator is not disappeared if it is
   appeared at top of the argument list
 * #4623: sphinx.build_main no longer exists in 1.7.0
+* #4615: The argument of ``sphinx.build`` has been changed in 1.7.0
 
 Testing
 --------
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 27a5dc63a..ace7c02e1 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -67,27 +67,28 @@ def main(*args, **kwargs):
         RemovedInSphinx20Warning,
         stacklevel=2,
     )
+    args = args[1:]  # skip first argument to adjust arguments (refs: #4615)
     return build.main(*args, **kwargs)
 
 
-def build_main(argv=sys.argv[1:]):
+def build_main(argv=sys.argv):
     """Sphinx build "main" command-line entry."""
     warnings.warn(
         '`sphinx.build_main()` has moved to `sphinx.cmd.build.build_main()`.',
         RemovedInSphinx20Warning,
         stacklevel=2,
     )
-    return build.build_main(argv)
+    return build.build_main(argv[1:])  # skip first argument to adjust arguments (refs: #4615)
 
 
-def make_main(argv=sys.argv[1:]):
+def make_main(argv=sys.argv):
     """Sphinx build "make mode" entry."""
     warnings.warn(
         '`sphinx.build_main()` has moved to `sphinx.cmd.build.make_main()`.',
         RemovedInSphinx20Warning,
         stacklevel=2,
     )
-    return build.make_main(argv)
+    return build.make_main(argv[1:])  # skip first argument to adjust arguments (refs: #4615)
 
 
 if __name__ == '__main__':
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 4e20fb7e4..be5e5c5ab 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -21,6 +21,7 @@ def main(*args, **kwargs):
         RemovedInSphinx20Warning,
         stacklevel=2,
     )
+    args = args[1:]  # skip first argument to adjust arguments (refs: #4615)
     _main(*args, **kwargs)
 
 
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 81676e8b1..ab4cf92da 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -22,6 +22,7 @@ def main(*args, **kwargs):
         RemovedInSphinx20Warning,
         stacklevel=2,
     )
+    args = args[1:]  # skip first argument to adjust arguments (refs: #4615)
     _main(*args, **kwargs)