From a55d3ecc71b6f82e23d653935c838d26954eda47 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 16 Apr 2003 20:44:33 +0000 Subject: [PATCH] Make initialize not fail when there is no BOOST_ROOT defined [SVN r18268] --- new/boostbook.jam | 10 +++++++--- v2/boostbook.jam | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/new/boostbook.jam b/new/boostbook.jam index fa202d0bb..2ba33d16d 100644 --- a/new/boostbook.jam +++ b/new/boostbook.jam @@ -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/ ] ; + } } } diff --git a/v2/boostbook.jam b/v2/boostbook.jam index fa202d0bb..2ba33d16d 100644 --- a/v2/boostbook.jam +++ b/v2/boostbook.jam @@ -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/ ] ; + } } }