From 14f376128a25d6aef044e405d7f7c9e76a14e7ac Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 24 Feb 2013 14:46:28 +0000
Subject: [PATCH] Merge auto-index fixes. Fixes #7899.

[SVN r83132]
---
 doc/Jamfile.v2 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index f0d1056..5c470ce 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -48,8 +48,8 @@ boostbook standalone
    :
       container
    :
-        <xsl:param>boost.root=../../../..
-        <xsl:param>boost.libraries=../../../../libs/libraries.htm
+        <format>html:<xsl:param>boost.root=../../../..
+        <format>html:<xsl:param>boost.libraries=../../../../libs/libraries.htm
         <xsl:param>generate.section.toc.level=3
         <xsl:param>chunk.first.sections=1
         <format>pdf:<xsl:param>img.src.path=$(images_location)/
@@ -71,6 +71,7 @@ boostbook standalone
        
         # Choose indexing method for html:
         <format>html:<auto-index-internal>on
+        <format>docbook:<auto-index-internal>on
        
         # Set the name of the script file to use (index.idx is popular):
         <auto-index-script>$(here)/index.idx
@@ -89,3 +90,5 @@ boostbook standalone
 
 install pdfinstall : standalone/<format>pdf : <install-type>PDF <location>. <name>container.pdf ;
 explicit pdfinstall ;
+
+