From a02a2e7018f233082b1069be331e2ddb7c14eb8f Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 24 May 2005 17:13:02 +0000
Subject: [PATCH] Made it work with an unmodified CWPro8 installation.  Pro9
 may still need its setup script tweaked.

[SVN r29174]
---
 src/tools/cw.jam | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/tools/cw.jam b/src/tools/cw.jam
index b7f6648bd..e2101589b 100644
--- a/src/tools/cw.jam
+++ b/src/tools/cw.jam
@@ -46,13 +46,16 @@ rule init ( version ? : command * : options * )
     {
         command = [ common.get-absolute-tool-path $(command[-1]) ] ;
     }
-    local root = $(command) ;
+    local tool-root = $(command) ;
 
-    setup = $(root)\\$(setup) ;
+    setup = $(tool-root)\\$(setup) ;
 
    # map the batch file in setup so it can be executed
 
-   setup = "call \""$(setup)"\" > nul " ;
+    other-tools = $(tool-root:D) ;
+    root = $(other-tools:D) ;
+    
+    setup = "set \"CWFOLDER="$(root)"\" && call \""$(setup)"\" > nul " ;
 
    if [ os.name ] = NT
    {