[Python-checkins] cpython (merge 3.4 -> default): Issue #21688: Merge with 3.4

[zach.ware]

http://hg.python.org/cpython/rev/e5594e751a2e
changeset:   91120:e5594e751a2e
parent:      91118:68d45a1a3ce0
parent:      91119:b841b80e6421
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jun 10 12:08:20 2014 -0500
summary:
  Issue #21688: Merge with 3.4

files:
  Doc/make.bat |  9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Doc/make.bat b/Doc/make.bat
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -76,6 +76,15 @@
 cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
 
 if "%1" EQU "htmlhelp" (
+    if  not exist "%HTMLHELP%" (
+        echo.
+        echo.The HTML Help Workshop was not found.  Set the HTMLHELP variable
+        echo.to the path to hhc.exe or download and install it from
+        echo.http://msdn.microsoft.com/en-us/library/ms669985
+        rem Set errorlevel to 1 and exit
+        cmd /C exit /b 1
+        goto end
+    )
     cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
     rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
     if not errorlevel 2 cmd /C exit /b 0

-- 
Repository URL: http://hg.python.org/cpython