From: Evan Hunt <each@isc.org>
Date: Tue, 2 Jul 2013 03:11:21 +0000 (-0700)
Subject: [master] fixed win32 buildsetup glitch
X-Git-Tag: v9.10.0a1~246
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4a42587629bcecc9eb88eebc94ef04c4df5ece0c;p=thirdparty%2Fbind9.git

[master] fixed win32 buildsetup glitch
---

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 2bdd319cb04..21f198caca2 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -98,7 +98,7 @@ if Exist "%VCRedistPath%" (
 echo Copying Visual C x86 Redistributable Installer
 
 rem
-rem Use /Y so we allways have the current version of the installer.
+rem Use /Y so we always have the current version of the installer.
 rem
 
 copy /Y "%VCRedistPath%" ..\Build\Release\
@@ -111,17 +111,12 @@ copy /Y	"%VCRedistPath%" ..\Build\Debug\
 )
 ) else (
 
-rem
-rem set vcredist here so that it is correctly expanded in the if body 
-rem
-set vcredist=BootStrapper\Packages\vcredist_x86\vcredist_x86.exe
-
 if Defined FrameworkSDKDir (
 
 rem
 rem vcredist_x86.exe path relative to FrameworkSDKDir
 rem 
-if Exist "%FrameworkSDKDir%\%vcredist%" (
+if Exist "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" (
 
 echo Copying Visual C x86 Redistributable Installer
 
@@ -129,8 +124,8 @@ rem
 rem Use /Y so we allways have the current version of the installer.
 rem
 
-copy /Y "%FrameworkSDKDir%\%vcredist%" ..\Build\Release\
-copy /Y "%FrameworkSDKDir%\%vcredist%" ..\Build\Debug\
+copy /Y "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"  ..\Build\Release\
+copy /Y "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"  ..\Build\Debug\
 
 ) else (
 	echo "**** %FrameworkSDKDir%\%vcredist% not found ****"