Jon Clark put . in his path

1 files changed, 7 insertions, 2 deletions

diff --git a/bjam b/bjam
index 8a61f3f65..2ae074a4b 100755
--- a/bjam
+++ b/bjam
@@ -1,7 +1,12 @@
 #!/bin/bash
 set -e
-#This checks for bjam including boost-build.
-if bjam --help >/dev/null 2>/dev/null; then
+self="$(readlink -f "$0")"
+if 
+  which bjam >/dev/null 2>/dev/null && #Have a bjam in path
+  [ "$self" != "$(readlink -f "$(which bjam)")" ] && #bjam in path isn't this script
+  bjam --help >/dev/null 2>/dev/null #bjam in path isn't broken (i.e. has boost-build)
+then
+  #Delegate to system bjam
   exec bjam "$@"
 fi