#2208: allow for non-standard HHC location.

diff --git a/Doc/make.bat b/Doc/make.bat
index a26851fb787cfe10fbb4760d445eaf2839feb842..504e4b58e47acc73c8f2836e617e48ab9589e7f2 100644 (file)
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -1,8 +1,9 @@
-@echo off\r
+@@echo off\r
 setlocal\r
 \r
 set SVNROOT=http://svn.python.org/projects\r
-if "%PYTHON%" EQU "" set PYTHON=python25\r
+if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python\r
+if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe\r
 \r
 if "%1" EQU "" goto help\r
 if "%1" EQU "html" goto build\r
@@ -41,7 +42,7 @@ if not exist build mkdir build
 if not exist build\%1 mkdir build\%1\r
 if not exist build\doctrees mkdir build\doctrees\r
 cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%1\r
-if "%1" EQU "htmlhelp" "%ProgramFiles%\HTML Help Workshop\hhc.exe" build\htmlhelp\pydoc.hhp\r
+if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\pydoc.hhp\r
 goto end\r
 \r
 :webrun\r