Fix a build error

WinMerge · Mar 7, 2021 · 8a7405a · 8a7405a
1 parent cc34184
commit 8a7405a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Docs/Manual/build_htmlhelp_en.bat b/Docs/Manual/build_htmlhelp_en.bat
@@ -1,5 +1,6 @@
 @echo off
 
+setlocal enabledelayedexpansion
 pushd %~dp0
 call configuration.bat
 
@@ -11,17 +12,16 @@ set docbook_outputdir_final=%docbook_build_path%\%docbook_outputdir%
 if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
 if not exist "%docbook_outputdir_final%" mkdir "%docbook_outputdir_final%"
 
-setlocal enabledelayedexpansion
 if "%1" == "/build" (
   if exist "%docbook_outputdir_final%\WinMerge.chm" (
     copy "%docbook_outputdir_final%\WinMerge.chm" EN\WinMerge.chm 2> NUL > NUL
   )
   for /f "tokens=*" %%i in ('dir /a:-d /b /o:d /t:w EN') do set NEWEST=%%~nxi
   del EN\WinMerge.chm 2> NUL
-  if "!NEWEST!" == "WinMerge.chm" goto :eof
+  if "!NEWEST!" == "WinMerge.chm" goto end
 ) else if "%1" == "/clean" (
   del "%docbook_outputdir_final%\WinMerge.chm"
-  goto :eof
+  goto end
 )
 
 echo Copy images...
@@ -65,4 +65,5 @@ goto end
 
 :end
 popd
+setlocal disabledelayedexpansion
 @echo on
diff --git a/Docs/Manual/build_htmlhelp_jp.bat b/Docs/Manual/build_htmlhelp_jp.bat
@@ -1,5 +1,6 @@
 @echo off
 
+setlocal enabledelayedexpansion
 pushd %~dp0
 call configuration.bat
 
@@ -11,17 +12,16 @@ set docbook_outputdir_final=%docbook_build_path%\%docbook_outputdir%
 if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
 if not exist "%docbook_outputdir_final%" mkdir "%docbook_outputdir_final%"
 
-setlocal enabledelayedexpansion
 if "%1" == "/build" (
   if exist "%docbook_outputdir_final%\WinMergeJapanese.chm" (
     copy "%docbook_outputdir_final%\WinMergeJapanese.chm" JP\WinMergeJapanese.chm  2> NUL > NUL
   )
   for /f "tokens=*" %%i in ('dir /a:-d /b /o:d /t:w JP') do set NEWEST=%%~nxi
   del JP\WinMergeJapanese.chm 2> NUL
-  if "!NEWEST!" == "WinMergeJapanese.chm" goto :eof
+  if "!NEWEST!" == "WinMergeJapanese.chm" goto end
 ) else if "%1" == "/clean" (
   del "%docbook_outputdir_final%\WinMergeJapanese.chm"
-  goto :eof
+  goto end
 )
 
 echo Copy images...
@@ -65,4 +65,5 @@ goto end
 
 :end
 popd
+setlocal disabledelayedexpansion
 @echo on