mirror of
https://github.com/boostorg/boost.git
synced 2025-04-07 22:39:25 +00:00
Restore BBv1 install functionality of installing to c:/Boost by default.
[SVN r35761]
This commit is contained in:
parent
00141cd449
commit
9b9611c94c
2 changed files with 19 additions and 6 deletions
23
Jamfile.v2
23
Jamfile.v2
|
@ -282,6 +282,22 @@ rule tag ( name : type ? : property-set )
|
|||
|
||||
# Install to system location.
|
||||
|
||||
local install-requirements =
|
||||
<install-source-root>boost
|
||||
;
|
||||
if $(layout-versioned)
|
||||
{
|
||||
install-requirements += <install-header-subdir>boost-$(BOOST_VERSION_TAG)/boost ;
|
||||
}
|
||||
if [ modules.peek : NT ]
|
||||
{
|
||||
install-requirements += <install-default-prefix>C:/Boost ;
|
||||
}
|
||||
else if [ modules.peek : UNIX ]
|
||||
{
|
||||
install-requirements += <install-default-prefix>/usr/local ;
|
||||
}
|
||||
|
||||
local headers =
|
||||
[ path.glob-tree boost : *.hpp *.ipp *.h *.inc : CVS ]
|
||||
[ path.glob-tree boost/compatibility/cpp_c_headers : c* : CVS ]
|
||||
|
@ -294,8 +310,7 @@ else { header-subdir = boost ; }
|
|||
|
||||
# Complete install
|
||||
package.install install
|
||||
: <install-source-root>boost
|
||||
<install-header-subdir>$(header-subdir)
|
||||
: $(install-requirements)
|
||||
:
|
||||
: libs/$(libraries)/build
|
||||
: $(headers)
|
||||
|
@ -321,7 +336,7 @@ alias build_all : libs/$(libraries)/build ;
|
|||
rule boost-install ( libraries * )
|
||||
{
|
||||
package.install install
|
||||
: <dependency>/boost//install-headers
|
||||
: <dependency>/boost//install-headers $(install-requirements)
|
||||
: # No binaries
|
||||
: $(libraries)
|
||||
: # No headers, it's handled by the dependency
|
||||
|
@ -337,8 +352,6 @@ rule boost-install ( libraries * )
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Make project ids of all libraries known.
|
||||
for local l in $(libraries)
|
||||
{
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit ad5521485b0050d6fd4611ce97dd3ab0d65fe52f
|
||||
Subproject commit 025df84f89befee2eccd24bb3aa5304d7550b10a
|
Loading…
Add table
Reference in a new issue