Revert "Fix build paths."

This reverts commit 0ac664e7f9ecf3c634894d4c45121e9fb526b70c.

9 files changed, 13 insertions, 13 deletions

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index ee6eaa4cb3..34894d989b 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -65,7 +65,7 @@ boostbook doc
     <dependency>../libs/date_time/xmldoc//gregorian_autodoc.xml
     <dependency>../libs/date_time/xmldoc//posix_time_autodoc.xml
     <dependency>../libs/date_time/xmldoc//local_time_autodoc.xml
-    <dependency>../tools/build/doc//jam_docs
+    <dependency>../tools/build/v2/doc//jam_docs
     <dependency>../tools/quickbook/doc//boost-doc-tools
     <dependency>../tools/quickbook/doc//quickbook
     <dependency>../libs/interprocess/doc//standalone/<format>docbook
@@ -101,7 +101,7 @@ boostbook doc
     <implicit-dependency>../libs/ratio/doc//ratio
     <implicit-dependency>../libs/typeof/doc//typeof
     <implicit-dependency>../libs/xpressive/doc//xpressive
-    <implicit-dependency>../tools/build/doc//jam_docs
+    <implicit-dependency>../tools/build/v2/doc//jam_docs
     <implicit-dependency>../tools/quickbook/doc//boost-doc-tools
     <implicit-dependency>../tools/quickbook/doc//quickbook
     <implicit-dependency>../libs/mpi/doc//mpi
diff --git a/doc/pdf/Jamfile.v2 b/doc/pdf/Jamfile.v2
index 852992d599..1cf2a6da82 100644
--- a/doc/pdf/Jamfile.v2
+++ b/doc/pdf/Jamfile.v2
@@ -93,7 +93,7 @@ install pdf-install
     ../../libs/xpressive/doc//standalone
 
     ../../tools/boostbook/doc//boostbook
-    ../../tools/build/doc//jam_docs
+    ../../tools/build/v2/doc//jam_docs
     ../../tools/quickbook/doc//standalone
     ../../tools/bcp/doc//standalone
   :
@@ -135,7 +135,7 @@ install phoenix-install
 
 install boost-build-install
   :
-    ../../tools/build/doc//userman
+    ../../tools/build/v2/doc//userman
   :
     <location>.
     <install-type>PDF
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 81bacb9161..6cb521cc14 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -749,7 +749,7 @@
     <xi:include href="../../tools/boostbook/doc/boostbook.xml"/>
     <xi:include href="quickbook.xml"/>
     <xi:include href="jam_docs.xml"/>
-    <xi:include href="../../tools/build/doc/src/userman.xml"/>
+    <xi:include href="../../tools/build/v2/doc/src/userman.xml"/>
   </part>
 </boostbook>
 
diff --git a/more/getting_started/detail/conclusion.rst b/more/getting_started/detail/conclusion.rst
index 44fb120e8a..2c439e143a 100644
--- a/more/getting_started/detail/conclusion.rst
+++ b/more/getting_started/detail/conclusion.rst
@@ -29,7 +29,7 @@ mailing list`_.
 
      -- the Boost Developers
 
-.. _Boost.Build reference manual: ../../tools/build/index.html
+.. _Boost.Build reference manual: ../../tools/build/v2/index.html
 .. _Boost Users' mailing list: http://www.boost.org/more/mailing_lists.htm#users
 .. _Boost.Build mailing list: http://www.boost.org/more/mailing_lists.htm#jamboost
 
diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html
index 2d2d096c04..561906f273 100644
--- a/more/getting_started/unix-variants.html
+++ b/more/getting_started/unix-variants.html
@@ -712,7 +712,7 @@ If you can't find what you need, or there's anything we can do to
 make this document clearer, please post it to the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users'
 mailing list</a>.</p>
 <ul class="simple">
-<li><a class="reference external" href="../../tools/build/index.html">Boost.Build reference manual</a></li>
+<li><a class="reference external" href="../../tools/build/v2/index.html">Boost.Build reference manual</a></li>
 <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users' mailing list</a></li>
 <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a></li>
 <li><a class="reference external" href="../../libs/index.html">Index of all Boost library documentation</a></li>
diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html
index 61a5c714dc..f3e9780cfe 100644
--- a/more/getting_started/windows.html
+++ b/more/getting_started/windows.html
@@ -782,7 +782,7 @@ If you can't find what you need, or there's anything we can do to
 make this document clearer, please post it to the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users'
 mailing list</a>.</p>
 <ul class="simple">
-<li><a class="reference external" href="../../tools/build/index.html">Boost.Build reference manual</a></li>
+<li><a class="reference external" href="../../tools/build/v2/index.html">Boost.Build reference manual</a></li>
 <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#users">Boost Users' mailing list</a></li>
 <li><a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a></li>
 <li><a class="reference external" href="../../libs/index.html">Index of all Boost library documentation</a></li>
diff --git a/tools/regression/src/regression.py b/tools/regression/src/regression.py
index fa437953ae..fdf00d0485 100644
--- a/tools/regression/src/regression.py
+++ b/tools/regression/src/regression.py
@@ -26,7 +26,7 @@ repo_path = {
     'trunk'         : 'trunk',
     'release'       : 'branches/release',
     'build'         : 'trunk/tools/build/v2',
-    'jam'           : 'trunk/tools/build/engine',
+    'jam'           : 'trunk/tools/build/v2/engine',
     'regression'    : 'trunk/tools/regression',
     'boost-build.jam'
                     : 'trunk/boost-build.jam'
@@ -373,7 +373,7 @@ class runner:
             fn = os.path.join(d, "test_log.xml")
             cd = os.getcwd()
             try:                
-                os.chdir (os.path.join (self.boost_root, 'tools/build/test'));
+                os.chdir (os.path.join (self.boost_root, 'tools/build/v2/test'));
                 bjam_path = os.path.dirname (self.tool_path( self.bjam ))
                 self.log( "Using bjam binary in '%s'" % (bjam_path))
                 os.putenv('PATH', bjam_path + os.pathsep + os.environ['PATH'])
diff --git a/tools/regression/src/run_tests.sh b/tools/regression/src/run_tests.sh
index d4c82f7d61..483cecfeae 100644
--- a/tools/regression/src/run_tests.sh
+++ b/tools/regression/src/run_tests.sh
@@ -75,7 +75,7 @@ exe_suffix=
 # The location of the binary for running bjam. The default should work
 # under most circumstances.
 #
-bjam="$boost_root/tools/build/engine/bin/bjam$exe_suffix"
+bjam="$boost_root/tools/build/v2/engine/bin/bjam$exe_suffix"
 
 #
 # "process_jam_log", and "compiler_status" paths to built helper programs:
@@ -133,7 +133,7 @@ fi
 # rebuild bjam if required:
 #
 echo building bjam:
-cd "$boost_root/tools/build/engine" && \
+cd "$boost_root/tools/build/v2/engine" && \
 LOCATE_TARGET=bin sh ./build.sh
 if test $? != 0 ; then
     echo "bjam build failed."
diff --git a/tools/regression/test/report/Jamfile.jam b/tools/regression/test/report/Jamfile.jam
index 65ebbe91c3..f8e241b800 100644
--- a/tools/regression/test/report/Jamfile.jam
+++ b/tools/regression/test/report/Jamfile.jam
@@ -6,7 +6,7 @@
 
 path-constant expected-results : expected_results.xml ;
 path-constant failures-markup : explicit-failures-markup.xml ;
-path-constant css : ../../xsl_reports/xsl/html/master.css ;
+path-constant css : ../../xsl_reports/xsl/v2/html/master.css ;
 path-constant comment : comment.html ;
 run ../../build//boost_report :
     --expected=\"$(expected-results)\"