From: Evan Hunt <each@isc.org>
Date: Tue, 2 Jul 2013 03:11:52 +0000 (-0700)
Subject: [v9_8] fixed win32 buildsetup glitch
X-Git-Tag: v9.8.6b1^0
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9383a01afc690cfe877288aded8d092c67f72cac;p=thirdparty%2Fbind9.git

[v9_8] fixed win32 buildsetup glitch
(cherry picked from commit 9fce471584da910407c5b998306ee6609bc7ccc2)
---

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 182e897d92f..7ac6baa3a6d 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -95,7 +95,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\
@@ -108,17 +108,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
 
@@ -126,8 +121,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 ****"