From e706a77bdb8f787533ea47b2ac60295d09df520b Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 22 Sep 2004 10:22:23 +0000
Subject: [PATCH] Changed to use VS80COMNTOOLS to determine Visual Studio path
 - this avoids conficts with other Visual C++ versions, but in the long run,
 we really should look to the registry for this.

[SVN r25334]
---
 v1/vc8.0-tools.jam | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/v1/vc8.0-tools.jam b/v1/vc8.0-tools.jam
index 0a1f74654..d48bf93ee 100644
--- a/v1/vc8.0-tools.jam
+++ b/v1/vc8.0-tools.jam
@@ -5,9 +5,9 @@ set-as-singleton VC80_ROOT ;
 
 if ! $(MSVCDir)
 {
-    if $(VCINSTALLDIR)
+    if $(VS80COMNTOOLS)
     {
-        VC80_ROOT ?= $(VCINSTALLDIR) ;
+        VC80_ROOT ?= $(VS80COMNTOOLS:J=" ")..\\..\\VC ;
         VC_TOOL_PATH = "$(VC80_ROOT)"\\bin\\ ;
         VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
     }
@@ -33,3 +33,4 @@ flags vc8.0 C++FLAGS <native-wchar_t>on : /Zc:wchar_t ;
 
 
 
+