From a26d129d0bd906990921b413d1192d4045e9633c Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 30 Jan 2011 14:03:44 +0000
Subject: [PATCH] Merge doc build changes for jam.
[SVN r68572]
---
doc/Jamfile.v2 | 4 ++--
doc/src/boost.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 490e47fde..bbc09f416 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -39,7 +39,7 @@ boostbook doc
<dependency>../libs/date_time/xmldoc//gregorian_autodoc.xml
<dependency>../libs/date_time/xmldoc//posix_time_autodoc.xml
<dependency>../libs/date_time/xmldoc//local_time_autodoc.xml
- <dependency>../tools/build/v2/engine/doc//bjam
+ <dependency>../tools/build/v2/doc//jam_docs
<dependency>../tools/quickbook/doc//quickbook
<dependency>../libs/interprocess/doc//autodoc.xml
<dependency>../libs/interprocess/doc//interprocess
@@ -64,7 +64,7 @@ boostbook doc
<implicit-dependency>../libs/proto/doc//proto
<implicit-dependency>../libs/typeof/doc//typeof
<implicit-dependency>../libs/xpressive/doc//xpressive
- <implicit-dependency>../tools/build/v2/engine/doc//bjam
+ <implicit-dependency>../tools/build/v2/doc//jam_docs
<implicit-dependency>../tools/quickbook/doc//quickbook
<implicit-dependency>../libs/mpi/doc//mpi
<implicit-dependency>../libs/interprocess/doc//interprocess
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 266d29d58..c59b593e2 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -749,7 +749,7 @@
</partintro>
<xi:include href="../../tools/boostbook/doc/boostbook.xml"/>
<xi:include href="quickbook.xml"/>
- <xi:include href="bjam.xml"/>
+ <xi:include href="jam_docs.xml"/>
<xi:include href="../../tools/build/v2/doc/src/userman.xml"/>
</part>
</boostbook>