Revert "bpo-44756: in ./Doc, make build depends on make html (python#27403)"

jdevries3133 · jdevries3133 · commit bb9d5153f0c1 · 2021-08-03T13:36:07.000-04:00
This reverts commit d22c876.
diff --git a/Doc/Makefile b/Doc/Makefile
@@ -45,7 +45,7 @@ help:
 	@echo "  check      to run a check for frequent markup errors"
 	@echo "  serve      to serve the documentation on the localhost (8000)"
 
-build: venv
+build:
 	-mkdir -p build
 # Look first for a Misc/NEWS file (building from a source release tarball
 # or old repo) and use that, otherwise look for a Misc/NEWS.d directory
@@ -137,21 +137,14 @@ pydoc-topics: build
 htmlview: html
 	 $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
 
-clean: clean-venv
-	-rm -rf build/*
-
-clean-venv:
-	rm -rf $(VENVDIR)
+clean:
+	-rm -rf build/* $(VENVDIR)/*
 
 venv:
-	@if [ -d $(VENVDIR) ] ; then \
-		echo "venv already exists"; \
-	else \
-		$(PYTHON) -m venv $(VENVDIR); \
-		$(VENVDIR)/bin/python3 -m pip install -U pip setuptools; \
-		$(VENVDIR)/bin/python3 -m pip install -r requirements.txt; \
-		echo "The venv has been created in the $(VENVDIR) directory"; \
-	fi
+	$(PYTHON) -m venv $(VENVDIR)
+	$(VENVDIR)/bin/python3 -m pip install -U pip setuptools
+	$(VENVDIR)/bin/python3 -m pip install -r requirements.txt
+	@echo "The venv has been created in the $(VENVDIR) directory"
 
 dist:
 	rm -rf dist
diff --git a/Doc/README.rst b/Doc/README.rst
@@ -28,24 +28,28 @@ install the tools into there.
 Using make
 ----------
 
-To get started on UNIX, you can create a virtual environment and build
-documentation with the command::
+To get started on UNIX, you can create a virtual environment with the command ::
+
+  make venv
+
+That will install all the tools necessary to build the documentation. Assuming
+the virtual environment was created in the ``venv`` directory (the default;
+configurable with the VENVDIR variable), you can run the following command to
+build the HTML output files::
 
   make html
 
-The virtual environment in the ``venv`` directory will contain all the tools
-necessary to build the documentation.  You can also configure where the virtual
-environment directory will be with the ``VENVDIR`` variable.
+By default, if the virtual environment is not created, the Makefile will
+look for instances of sphinxbuild and blurb installed on your process PATH
+(configurable with the SPHINXBUILD and BLURB variables).
 
 On Windows, we try to emulate the Makefile as closely as possible with a
 ``make.bat`` file. If you need to specify the Python interpreter to use,
-set the PYTHON environment variable.
+set the PYTHON environment variable instead.
 
 Available make targets are:
 
-* "clean", which removes all build files and the virtual environment.
-
-* "clean-venv", which removes the virtual environment directory.
+* "clean", which removes all build files.
 
 * "venv", which creates a virtual environment with all necessary tools
   installed.
diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst b/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
