From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 8 Jan 2019 03:04:14 +0000 (-0800)
Subject: bpo-35374: Avoid trailing space in hhc file name if found on PATH. (GH-10849)
X-Git-Tag: v3.7.3rc1~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d1e0124cf562153a681d1b5b362e7c8e23edea9;p=thirdparty%2FPython%2Fcpython.git

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>
---

diff --git a/Doc/make.bat b/Doc/make.bat
index 461c35c5a114..e6604956ea91 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -41,7 +41,7 @@ if exist "%HTMLHELP%" goto :skiphhcsearch
 
 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"