Index: doc/make.bat =================================================================== --- doc/make.bat (revision 69459) +++ doc/make.bat (working copy) @@ -4,6 +4,7 @@ set SVNROOT=http://svn.python.org/projects if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe +if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v if "%1" EQU "" goto help if "%1" EQU "html" goto build @@ -51,7 +52,7 @@ if not exist build\%1 mkdir build\%1 if not exist build\doctrees mkdir build\doctrees cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%* -if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\pydoc.hhp +if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp goto end :end