Manually patched a few things that didn't get merged in, but should.
diff --git a/Doc/Makefile b/Doc/Makefile
index 955fb68..d26117b 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -4,9 +4,9 @@
#
# You can set these variables from the command line.
-PYTHON ?= python
-SVNROOT ?= http://svn.python.org/projects
-SPHINXOPTS ?=
+PYTHON = python
+SVNROOT = http://svn.python.org/projects
+SPHINXOPTS =
ALLSPHINXOPTS = -b$(BUILDER) -dbuild/doctrees $(SPHINXOPTS) . build/$(BUILDER)
@@ -55,7 +55,7 @@
htmlhelp: BUILDER = htmlhelp
htmlhelp: build
@echo "Build finished; now you can run HTML Help Workshop with the" \
- "build/hhp/pydoc.hhp project file."
+ "build/htmlhelp/pydoc.hhp project file."
clean:
-rm -rf build/*