commit 5d1e0124cf562153a681d1b5b362e7c8e23edea9
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jan 07 19:04:14 2019 -0800
committer GitHub <noreply@github.com> Mon Jan 07 19:04:14 2019 -0800
tree d4d95428f52676f9c2d6f78fd03a05208516f5bf
parent 88bd26a72eb4ab341cf19bea78a0039fbe4be3a2

bpo-35374: Avoid trailing space in hhc file name if found on PATH. (GH-10849)

(cherry picked from commit e61cc481e02b758c8d8289163102c236d0658a55)

Co-authored-by: chrullrich <chris@chrullrich.net>

Doc/make.bat

diff --git a/Doc/make.bat b/Doc/make.bat
index 461c35c..e660495 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -41,7 +41,7 @@
 
 rem Search for HHC in likely places
 set HTMLHELP=
-where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch
+where hhc /q && set "HTMLHELP=hhc" && goto :skiphhcsearch
 where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
 if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
 if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"