(merge from head) Fix incorrect placement of headers directly into includedir with system layout. Fix library names including toolset tag in system layout.

[SVN r35978]
This commit is contained in:
Rene Rivera 2006-11-10 16:29:29 +00:00
parent bbce9c8ddd
commit cfe64252d2

View file

@ -291,7 +291,7 @@ rule tag ( name : type ? : property-set )
else
{
return [ common.format-name
<base> <toolset> <threading> <runtime> -$(BUILD_ID)
<base> <threading> <runtime> -$(BUILD_ID)
: $(name) : $(type) : $(property-set) ] ;
}
}
@ -306,6 +306,10 @@ if $(layout-versioned)
{
install-requirements += <install-header-subdir>boost-$(BOOST_VERSION_TAG)/boost ;
}
else
{
install-requirements += <install-header-subdir>boost ;
}
if [ modules.peek : NT ]
{
install-requirements += <install-default-prefix>C:/Boost ;
@ -320,10 +324,6 @@ local headers =
[ path.glob-tree boost/compatibility/cpp_c_headers : c* : CVS ]
;
local header-subdir ;
if $(layout-versioned) { header-subdir = boost-$(BOOST_VERSION_TAG)/boost ; }
else { header-subdir = boost ; }
# Complete install
package.install install