[Boost-commit] svn:boost r48492 - trunk

From: jurko.gospodnetic_at_[hidden]
Date: 2008-08-31 05:55:30

Author: jurko
Date: 2008-08-31 05:55:30 EDT (Sun, 31 Aug 2008)
New Revision: 48492
URL: http://svn.boost.org/trac/boost/changeset/48492

Log:
Made installing/staging specific Boost libraries from their own folders instead of the root project folder work correctly.

 - install-requirements variable was local and so was not visible in rules called from other projects, e.g. boost-install().
 - header files always got searched for from the current folder instead of the root project folder.
 - boost-install() rule was referencing a non-existent install-headers target that got renamed to install-proper headers in revision 35986.

Patch contributed by Steven Watanabe.
Text files modified: 
   trunk/Jamroot |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/Jamroot
==============================================================================
--- trunk/Jamroot	(original)
+++ trunk/Jamroot	2008-08-31 05:55:30 EDT (Sun, 31 Aug 2008)
@@ -345,8 +345,8 @@
 
 # Install to system location.
 
-local install-requirements =
-    <install-source-root>boost
+install-requirements =
+    <install-source-root>$(BOOST_ROOT)/boost
     ;
 if $(layout-versioned)
 {
@@ -366,9 +366,9 @@
 }
 
 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
@@ -486,7 +486,7 @@
 rule boost-install ( libraries * )
 {
     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