diff --git a/v2/engine/src/Jambase b/v2/engine/src/Jambase index 5a9449983..467d52571 100644 --- a/v2/engine/src/Jambase +++ b/v2/engine/src/Jambase @@ -128,9 +128,13 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ] # Boost.Build files. local search-path = $(BOOST_BUILD_PATH) $(BOOST_ROOT) ; + local self = [ SELF_PATH ] ; + local boost-build-relative = ../../share/boost-build ; + local self-based-path = [ NORMALIZE_PATH $(boost-build-relative:R=$(self)) ] ; local boost-build-files = [ find-to-root [ PWD ] : boost-build.jam ] + [ GLOB $(self-based-path) : boost-build.jam ] # Another temporary measure so Jam works with Boost.Build v1. [ GLOB $(search-path) : boost-build.jam ] ; @@ -152,6 +156,7 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ] } ECHO "Attempted search from" [ PWD ] "up to the root" ; + ECHO "at" $(self-based-path) ; ECHO "and in these directories from BOOST_BUILD_PATH and BOOST_ROOT: "$(search-path:J=", ")"." ; EXIT "Please consult the documentation at 'http://www.boost.org'." ; } diff --git a/v2/engine/src/jambase.c b/v2/engine/src/jambase.c index dbcf263e3..d89f3c54d 100644 --- a/v2/engine/src/jambase.c +++ b/v2/engine/src/jambase.c @@ -68,8 +68,12 @@ char *jambase[] = { "|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1.\n", "{\n", "local search-path = $(BOOST_BUILD_PATH) $(BOOST_ROOT) ;\n", +"local self = [ SELF_PATH ] ;\n", +"local boost-build-relative = ../../share/boost-build ;\n", +"local self-based-path = [ NORMALIZE_PATH $(boost-build-relative:R=$(self)) ] ;\n", "local boost-build-files =\n", "[ find-to-root [ PWD ] : boost-build.jam ]\n", +"[ GLOB $(self-based-path) : boost-build.jam ]\n", "[ GLOB $(search-path) : boost-build.jam ] ;\n", ".boost-build-file = $(boost-build-files[1]) ;\n", "if ! $(.boost-build-file)\n", @@ -84,6 +88,7 @@ char *jambase[] = { "ECHO ;\n", "}\n", "ECHO \"Attempted search from\" [ PWD ] \"up to the root\" ;\n", +"ECHO \"at\" $(self-based-path) ;\n", "ECHO \"and in these directories from BOOST_BUILD_PATH and BOOST_ROOT: \"$(search-path:J=\", \")\".\" ;\n", "EXIT \"Please consult the documentation at 'http://www.boost.org'.\" ;\n", "}\n",