From d7524f1ec59a3696f2b9bd941d4365fe3cbbcb89 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Thu, 28 Feb 2002 06:03:19 +0000
Subject: [PATCH] better path handling

[SVN r12976]
---
 boost-base.jam    | 6 +++---
 v1/boost-base.jam | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boost-base.jam b/boost-base.jam
index c6340f40d..17fc40cb1 100644
--- a/boost-base.jam
+++ b/boost-base.jam
@@ -141,7 +141,7 @@ rule Link-EXE
 {
     # N.B. By the time this rule is invoked, we had better have gRUN_PATH completely set.
     Link-action $(<) : $(>) : EXE ;
-    RUN_PATH on $(<) = [ join $(gRUN_PATH($(<))) $(RUN_PATH) : $(SPLITPATH) ] ;
+    RUN_PATH on $(<) = [ join $(gRUN_PATH($(<))) : $(SPLITPATH) ] ;
     if $(UNIX) 
     {
         RUN_LD_LIBRARY_PATH on $(<) = [ join $(gRUN_LD_LIBRARY_PATH($(<))) $(RUN_LD_LIBRARY_PATH) : $(SPLITPATH) ] ;
@@ -190,7 +190,7 @@ if $(UNIX)
 {
     actions Run
     {
-        $(SHELL_SET)PATH=$(RUN_PATH)
+        $(SHELL_SET)PATH=$(RUN_PATH):$PATH
         $(SHELL_EXPORT)PATH
         $(SHELL_SET)LD_LIBRARY_PATH=$(RUN_LD_LIBRARY_PATH)
         $(SHELL_EXPORT)LD_LIBRARY_PATH
@@ -201,7 +201,7 @@ else
 {
     actions Run
     {
-        $(SHELL_SET)PATH=$(RUN_PATH)
+        $(SHELL_SET)PATH=$(RUN_PATH);%PATH%
         $(SHELL_EXPORT)PATH
         $(<) $(COMMAND-LINE)
     }
diff --git a/v1/boost-base.jam b/v1/boost-base.jam
index c6340f40d..17fc40cb1 100644
--- a/v1/boost-base.jam
+++ b/v1/boost-base.jam
@@ -141,7 +141,7 @@ rule Link-EXE
 {
     # N.B. By the time this rule is invoked, we had better have gRUN_PATH completely set.
     Link-action $(<) : $(>) : EXE ;
-    RUN_PATH on $(<) = [ join $(gRUN_PATH($(<))) $(RUN_PATH) : $(SPLITPATH) ] ;
+    RUN_PATH on $(<) = [ join $(gRUN_PATH($(<))) : $(SPLITPATH) ] ;
     if $(UNIX) 
     {
         RUN_LD_LIBRARY_PATH on $(<) = [ join $(gRUN_LD_LIBRARY_PATH($(<))) $(RUN_LD_LIBRARY_PATH) : $(SPLITPATH) ] ;
@@ -190,7 +190,7 @@ if $(UNIX)
 {
     actions Run
     {
-        $(SHELL_SET)PATH=$(RUN_PATH)
+        $(SHELL_SET)PATH=$(RUN_PATH):$PATH
         $(SHELL_EXPORT)PATH
         $(SHELL_SET)LD_LIBRARY_PATH=$(RUN_LD_LIBRARY_PATH)
         $(SHELL_EXPORT)LD_LIBRARY_PATH
@@ -201,7 +201,7 @@ else
 {
     actions Run
     {
-        $(SHELL_SET)PATH=$(RUN_PATH)
+        $(SHELL_SET)PATH=$(RUN_PATH);%PATH%
         $(SHELL_EXPORT)PATH
         $(<) $(COMMAND-LINE)
     }