Merge pull request #23634 from QuLogic/make-opts

tacaswell · web-flow · commit f791518fe543 · 2022-08-19T15:27:30.000-04:00
make.bat: Don't override SPHINXOPTS/O from the environment
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -82,12 +82,6 @@ it, use
 
    make SPHINXOPTS= html
 
-On Windows the arguments must be at the end of the statement:
-
-.. code-block:: bat
-
-   make html SPHINXOPTS=
-
 You can use the ``O`` variable to set additional options:
 
 * ``make O=-j4 html`` runs a parallel build with 4 processes.
@@ -97,12 +91,11 @@ You can use the ``O`` variable to set additional options:
 Multiple options can be combined using e.g. ``make O='-j4 -Dplot_gallery=0'
 html``.
 
-On Windows, either put the arguments at the end of the statement or set the options as environment variables, e.g.:
+On Windows, set the options as environment variables, e.g.:
 
 .. code-block:: bat
 
-   set O=-W --keep-going -j4
-   make html
+   set SPHINXOPTS= & set O=-j4 -Dplot_gallery=0 & make html
 
 Showing locally built docs
 --------------------------
diff --git a/doc/make.bat b/doc/make.bat
@@ -10,8 +10,9 @@ if "%SPHINXBUILD%" == "" (
 set SOURCEDIR=.
 set BUILDDIR=build
 set SPHINXPROJ=matplotlib
-set SPHINXOPTS=-W
-set O=
+if defined SPHINXOPTS goto skipopts
+set SPHINXOPTS=-W --keep-going
+:skipopts
 
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (
