From 0f61b0e1ecd02a399303bb2ef3fc07570bb00ce2 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sat, 14 Aug 2010 07:21:08 +0000
Subject: [PATCH] Jamroot fixes: use right path for headers, simplify some
 things.

[SVN r64794]
---
 Jamroot      | 7 +++----
 boostcpp.jam | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jamroot b/Jamroot
index 91ef5b932b..f28e873d94 100644
--- a/Jamroot
+++ b/Jamroot
@@ -129,6 +129,7 @@ import package ;
 import sequence ;
 import xsltproc ;
 import set ;
+import path ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.44.0 ;
@@ -242,9 +243,7 @@ rule boost-install ( libraries * )
 
     install stage : $(libraries) : <location>$(BOOST_STAGE_LOCATE) ;
 
-    local c = [ project.current ] ;
-    local project-module = [ $(c).project-module ] ;
-    module $(project-module)
+    module [ CALLER_MODULE ]
     {
         explicit stage ;
         explicit install ;
@@ -261,4 +260,4 @@ headers =
 
 # Declare special top-level targets that build and install the desired variants
 # of the libraries.
-boostcpp.declare_targets $(all-libraries) : $(headers) ;
+boostcpp.declare-targets $(all-libraries) : $(headers) ;
diff --git a/boostcpp.jam b/boostcpp.jam
index bf1b3bffdf..330a974d95 100644
--- a/boostcpp.jam
+++ b/boostcpp.jam
@@ -31,6 +31,7 @@ import package ;
 ##############################################################################  
 
 BOOST_ROOT = [ modules.binding $(__name__) ] ;
+BOOST_ROOT = $(BOOST_ROOT:D) ;
 
 rule set-version ( version )
 {
@@ -552,7 +553,7 @@ rule libraries-to-install ( existing-libraries * )
    }
 }
 
-rule declare_targets ( all-libraries * : headers * )
+rule declare-targets ( all-libraries * : headers * )
 {
     configure.register-components $(all-libraries) ;