Index: Jamroot
===================================================================
--- Jamroot	(revision 47856)
+++ Jamroot	(working copy)
@@ -343,8 +343,8 @@
 
 # Install to system location.
 
-local install-requirements =
-    <install-source-root>boost
+install-requirements =
+    <install-source-root>$(BOOST_ROOT)/boost
     ;
 if $(layout-versioned)
 {
@@ -364,11 +364,10 @@
 }
 
 local headers =
-    [ path.glob-tree boost : *.hpp *.ipp *.h *.inc : CVS ]
-    [ path.glob-tree boost/compatibility/cpp_c_headers : c* : CVS ]
+    [ path.glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc : CVS ]
+    [ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS ]
     ;
 
-
 # Complete install
 package.install install-proper
     :   $(install-requirements) <install-no-version-symlinks>on
@@ -483,8 +482,9 @@
 # - libraries -- list of library targets to install.
 rule boost-install ( libraries * )
 {
+    echo $(install-requirements) ;
     package.install install
-        : <dependency>/boost//install-headers $(install-requirements)
+        : <dependency>/boost//install-proper-headers $(install-requirements)
         : # No binaries
         : $(libraries)
         : # No headers, it's handled by the dependency
Index: tools/build/v2/tools/package.jam
===================================================================
--- tools/build/v2/tools/package.jam	(revision 47856)
+++ tools/build/v2/tools/package.jam	(working copy)
@@ -44,6 +44,7 @@
     # that's what needed.
     local install-source-root
         = [ property.select <install-source-root> : $(requirements) ] ;
+    install-source-root = $(install-source-root:G=) ;
     requirements = [ property.change $(requirements) : <install-source-root> ] ;
     
     #
@@ -56,6 +57,7 @@
     # First, figure out all locations. Use the default if no prefix option given.
     local prefix = [ option.get prefix :
         [ property.select <install-default-prefix> : $(requirements) ] ] ;
+    prefix = $(prefix:G=) ;
     requirements = [ property.change $(requirements) : <install-default-prefix> ] ;
     # Or some likely defaults if neither is given.
     if ! $(prefix)