diff options
| author | Rene Rivera <grafikrobot@gmail.com> | 2006-11-10 16:29:29 +0000 |
|---|---|---|
| committer | Rene Rivera <grafikrobot@gmail.com> | 2006-11-10 16:29:29 +0000 |
| commit | cfe64252d2fd7c8c2ddbd552d85dbfe52211c49f (patch) | |
| tree | 1f863b0cabf8b1229f1aa1bdfdfa6791e45661c9 /Jamfile.v2 | |
| parent | bbce9c8ddd609153146f53a70f8b829adfc67563 (diff) | |
| download | boost-cfe64252d2fd7c8c2ddbd552d85dbfe52211c49f.tar.gz | |
(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]
Diffstat (limited to 'Jamfile.v2')
| -rw-r--r-- | Jamfile.v2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Jamfile.v2 b/Jamfile.v2 index 0eb041579b..cebb1f34fe 100644 --- a/Jamfile.v2 +++ b/Jamfile.v2 @@ -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 |