From da27fd267346e213512f4835dd0b7b40e6172bbe Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 17 Aug 2007 00:24:54 +0000 Subject: Manually patched a few things that didn't get merged in, but should. --- Doc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Doc/Makefile') diff --git a/Doc/Makefile b/Doc/Makefile index 955fb68b14..d26117be1b 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 @@ web: build 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/* -- cgit v1.2.1