Fix previous.sh for people who don't have bjam installed

1 files changed, 7 insertions, 1 deletions

diff --git a/Jamroot b/Jamroot
index 8faf5c7c2..8bff74366 100644
--- a/Jamroot
+++ b/Jamroot
@@ -229,6 +229,12 @@ if ! [ path.exists $(BUILD-LOG) ] {
   SHELL "touch $(BUILD-LOG) && chmod +x $(BUILD-LOG)" ;
 }
 local script = [ modules.peek : ARGV ] ;
-script = $(script:J=" ") ;
+if $(script[1]) = "./jam-files/bjam" {
+  #The ./bjam shell script calls ./jam-files/bjam so that appears in argv but
+  #we want ./bjam to appear so the environment variables are set correctly.  
+  script = "./bjam "$(script[2-]:J=" ") ;
+} else {
+  script = $(script:J=" ") ;
+}
 script = "#!/bin/sh\n$(script)\n" ;
 local ignored = @($(BUILD-LOG):E=$(script)) ;