[Python-checkins] r61135 - python/trunk/Doc/make.bat

[georg.brandl]

Author: georg.brandl
Date: Fri Feb 29 19:21:29 2008
New Revision: 61135

Modified:
   python/trunk/Doc/make.bat
Log:
#2208: allow for non-standard HHC location.


Modified: python/trunk/Doc/make.bat
==============================================================================
--- python/trunk/Doc/make.bat	(original)
+++ python/trunk/Doc/make.bat	Fri Feb 29 19:21:29 2008
@@ -1,8 +1,9 @@
- at echo off
+@@echo off
 setlocal
 
 set SVNROOT=http://svn.python.org/projects
-if "%PYTHON%" EQU "" set PYTHON=python25
+if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
+if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
 
 if "%1" EQU "" goto help
 if "%1" EQU "html" goto build
@@ -41,7 +42,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\%1
-if "%1" EQU "htmlhelp" "%ProgramFiles%\HTML Help Workshop\hhc.exe" build\htmlhelp\pydoc.hhp
+if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\pydoc.hhp
 goto end
 
 :webrun