* Change to look for Boost.Build 1 and 2 in there new locations: tools/build/v1 and tools/build/v2.

* Remove version check for v2 as it's done by the bootstrap.


[SVN r20547]

1 files changed, 10 insertions, 11 deletions

diff --git a/boost-build.jam b/boost-build.jam
index 0b34ebd9c9..b7e659c80b 100644
--- a/boost-build.jam
+++ b/boost-build.jam
@@ -1,18 +1,17 @@
+#~ Copyright (C) 2002-2003, David Abrahams.
+#~ Copyright (C) 2002-2003, Vladimir Prus.
+#~ Copyright (C) 2003, Rene Rivera.
+#~ Use, modification and distribution are subject to the
+#~ Boost Software License, Version 1.0. (See accompanying file
+#~ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 BOOST_ROOT = $(.boost-build-file:D) ;
 if --v2 in $(ARGV)
 {
-    if $(JAM_VERSION:J="") < 030105
-    {
-        ECHO "error: Boost.Jam 3.1.5 or later required" ;
-        EXIT ;
-    }
-    else
-    {
-        JAMFILE = [Jj]amfile.v2 ;
-        boost-build tools/build/kernel ;
-    }   
+    JAMFILE = [Jj]amfile.v2 ;
+    boost-build tools/build/v2 ;
 }
 else
 {
-    boost-build tools/build ;
+    boost-build tools/build/v1 ;
 }