Prep for formal inclusion into Boost trunk.

test/build.jam

@@ -4,15 +4,24 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
+if $(BOOST_PREDEF_ROOT)
+{
+    path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_PREDEF_ROOT)/include ;
+}
+else
+{
+    path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_ROOT) ;
+}
+
 project test
     :   requirements
-        <include>$(BOOST_PREDEF_ROOT)/include
-        <dependency>$(BOOST_PREDEF_ROOT)/include/boost/predef.h
+        <include>$(BOOST_PREDEF_INCLUDE_ROOT)
+        <dependency>$(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef.h
     ;
 
 using testing ;
 
-test-suite config :
+test-suite predef :
     [ run info_as_cpp.cpp : : : <test-info>always_show_run_output ]
     [ run info_as_c.c : : : <test-info>always_show_run_output ]
     [ run info_as_objcpp.mm : : : <test-info>always_show_run_output ]