From 2d74f246708fda0421d05fc36a47a735903a0bca Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 15 Sep 2004 11:08:30 +0000
Subject: [PATCH] Fixed to work with VC8 Express edition

[SVN r25109]
---
 v1/vc8.0-tools.jam | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/v1/vc8.0-tools.jam b/v1/vc8.0-tools.jam
index 27035cd56..0a1f74654 100644
--- a/v1/vc8.0-tools.jam
+++ b/v1/vc8.0-tools.jam
@@ -5,11 +5,21 @@ set-as-singleton VC80_ROOT ;
 
 if ! $(MSVCDir)
 {
-    ProgramFiles ?= $(PROGRAMFILES) ;
-    VC80_ROOT ?= $(ProgramFiles:J=" ")"\\Microsoft Visual Studio .NET Whidbey\\VC7" ;
-    VC_TOOL_PATH = "$(VC80_ROOT)"\\bin\\ ;
-    VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
+    if $(VCINSTALLDIR)
+    {
+        VC80_ROOT ?= $(VCINSTALLDIR) ;
+        VC_TOOL_PATH = "$(VC80_ROOT)"\\bin\\ ;
+        VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
+    }
+    else
+    {
+        ProgramFiles ?= $(PROGRAMFILES) ;
+        VC80_ROOT ?= $(ProgramFiles:J=" ")"\\Microsoft Visual Studio .NET Whidbey\\VC7" ;
+        VC_TOOL_PATH = "$(VC80_ROOT)"\\bin\\ ;
+        VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
+    }
 }
+
 VC_PDB_NAME = vc80 ;
 
 feature native-wchar_t : on off ;
@@ -20,3 +30,6 @@ flags vc8.0 C++FLAGS <native-wchar_t>on : /Zc:wchar_t ;
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
 #//<a href="http://msdn.microsoft.com/vstudio/whidbey/default.aspx">Micro-<br>soft<br>VC++</a>
+
+
+