From 4c47cbf533883a3853b303282eb371291662ddf5 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 9 Aug 2015 11:00:07 +0100 Subject: [PATCH] buildconf.bat: Maintain compatibility with DOS based systems Commit f08e30d7bc broke compatibility with DOS and non Windows NT based versions of Windows due to the use of the setlocal command. --- buildconf.bat | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/buildconf.bat b/buildconf.bat index 25f1928bf..9b99fdaec 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -24,14 +24,14 @@ rem *************************************************************************** rem NOTES rem rem This batch file must be used to set up a git tree to build on systems where -rem there is no autotools support (i.e. Windows). +rem there is no autotools support (i.e. DOS and Windows). rem rem This file is not included or required for curl's release archives or daily rem snapshot archives. :begin rem Set our variables - setlocal + if "%OS%" == "Windows_NT" setlocal set MODE=GENERATE rem Switch to this batch file's directory @@ -143,9 +143,17 @@ rem goto error :error - endlocal + if "%OS%" == "Windows_NT" ( + endlocal + ) else ( + set MODE= + ) exit /B 1 :success - endlocal + if "%OS%" == "Windows_NT" ( + endlocal + ) else ( + set MODE= + ) exit /B 0