From de62cd7a45c9b3ab2be2e0117e6777e01f8ec28b Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sun, 2 Jul 2006 22:23:43 +0000
Subject: [PATCH] Fix a variety of differences in the install process between
 BBv1 and BBv2... versioned subdir for the headers; stage libs only; default
 built variants, version tag.

[SVN r34448]
---
 src/tools/package.jam | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/tools/package.jam b/src/tools/package.jam
index ff9dd0eb0..e44f851bf 100644
--- a/src/tools/package.jam
+++ b/src/tools/package.jam
@@ -39,14 +39,19 @@ import property ;
 
 rule install ( name : requirements * : binaries * : libraries * : headers * )
 {
-    local install-source-root = [ property.select <install-source-root> 
-        : $(requirements) ] ;
     # If <install-source-root> is not specified, all headers are installed
     # to prefix/include, no matter what their relative path is. Sometimes
     # that's what needed.
-        
+    local install-source-root
+        = [ property.select <install-source-root> : $(requirements) ] ;
     requirements = [ property.change $(requirements) : <install-source-root> ] ;
     
+    #
+    local install-header-subdir
+        = [ property.select <install-header-subdir> : $(requirements) ] ;
+    install-header-subdir = /$(install-header-subdir:G=) ;
+    install-header-subdir ?= "" ;
+    requirements = [ property.change $(requirements) : <install-header-subdir> ] ;
     
     # First, figure out all locations.
     local prefix = [ option.get prefix : "" ] ;
@@ -77,7 +82,8 @@ rule install ( name : requirements * : binaries * : libraries * : headers * )
           <install-dependencies>on <install-type>LIB 
         ;
     stage.install $(name)-headers : $(headers) : $(requirements) 
-      <location>$(include-locate) <install-source-root>$(install-source-root) ;
+      <location>$(include-locate)$(install-header-subdir)
+      <install-source-root>$(install-source-root) ;
     alias $(name) : $(name)-bin $(name)-lib $(name)-headers ;
     
     local c = [ project.current ] ;