]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[v9_6] fixed win32 buildsetup glitch v9.6-ESV-R10b1
authorEvan Hunt <each@isc.org>
Tue, 2 Jul 2013 03:15:19 +0000 (20:15 -0700)
committerEvan Hunt <each@isc.org>
Tue, 2 Jul 2013 03:15:19 +0000 (20:15 -0700)
win32utils/BuildSetup.bat

index 8bfed02c58642b1648e1f49854a087076ce0ebe5..753e6b771c0057c902094181c93e9af0a935784f 100644 (file)
@@ -89,7 +89,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\
@@ -102,18 +102,13 @@ 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%" (
+rem
+if Exist "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" (
 
 echo Copying Visual C x86 Redistributable Installer
 
@@ -121,8 +116,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 ****"