mirror of
https://github.com/boostorg/build.git
synced 2026-02-17 13:42:14 +00:00
Make initialize not fail when there is no BOOST_ROOT defined
[SVN r18268]
This commit is contained in:
@@ -75,9 +75,13 @@ rule init ( docbook-xsl-dir ? : docbook-dtd-dir ? )
|
||||
{
|
||||
.docbook-dtd-dir = [ path.make $(docbook-dtd-dir) ] ;
|
||||
}
|
||||
local boost-root = [ path.make [ modules.peek : BOOST_ROOT ] ] ;
|
||||
.boostbook-xsl-dir = [ path.join $(boost-root) tools boostbook xsl/ ] ;
|
||||
.boostbook-dtd-dir = [ path.join $(boost-root) tools boostbook dtd/ ] ;
|
||||
local boost-root = [ modules.peek : BOOST_ROOT ] ;
|
||||
if $(boost-root)
|
||||
{
|
||||
local boost-root-path = [ path.make $(boost-root) ] ;
|
||||
.boostbook-xsl-dir = [ path.join $(boost-root-path) tools boostbook xsl/ ] ;
|
||||
.boostbook-dtd-dir = [ path.join $(boost-root-path) tools boostbook dtd/ ] ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -75,9 +75,13 @@ rule init ( docbook-xsl-dir ? : docbook-dtd-dir ? )
|
||||
{
|
||||
.docbook-dtd-dir = [ path.make $(docbook-dtd-dir) ] ;
|
||||
}
|
||||
local boost-root = [ path.make [ modules.peek : BOOST_ROOT ] ] ;
|
||||
.boostbook-xsl-dir = [ path.join $(boost-root) tools boostbook xsl/ ] ;
|
||||
.boostbook-dtd-dir = [ path.join $(boost-root) tools boostbook dtd/ ] ;
|
||||
local boost-root = [ modules.peek : BOOST_ROOT ] ;
|
||||
if $(boost-root)
|
||||
{
|
||||
local boost-root-path = [ path.make $(boost-root) ] ;
|
||||
.boostbook-xsl-dir = [ path.join $(boost-root-path) tools boostbook xsl/ ] ;
|
||||
.boostbook-dtd-dir = [ path.join $(boost-root-path) tools boostbook dtd/ ] ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user