summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2012-10-30 20:05:52 (GMT)
committerAnas Nashif <anas.nashif@intel.com>2013-08-26 12:27:18 (GMT)
commitdc50a0a0de2b1fabc0f123aa80ecd4bb997182c8 (patch)
tree811a6af6b359ce77421ec58fbeb787162ad6662e
parent538cd1ece138cd4ad16d9274f32820c42702322f (diff)
downloadboost-dc50a0a0de2b1fabc0f123aa80ecd4bb997182c8.zip
boost-dc50a0a0de2b1fabc0f123aa80ecd4bb997182c8.tar.gz
boost-dc50a0a0de2b1fabc0f123aa80ecd4bb997182c8.tar.bz2
use std xml catalogrefs/changes/80/8780/1
-rw-r--r--tools/build/v2/tools/boostbook.jam35
1 files changed, 1 insertions, 34 deletions
diff --git a/tools/build/v2/tools/boostbook.jam b/tools/build/v2/tools/boostbook.jam
index 3ab0deb..693e68a 100644
--- a/tools/build/v2/tools/boostbook.jam
+++ b/tools/build/v2/tools/boostbook.jam
@@ -494,40 +494,7 @@ rule generate-xml-catalog ( target : sources * : properties * )
" <rewriteURI uriStartString=\"http://www.boost.org/tools/boostbook/dtd/\" rewritePrefix=\"file://$(boostbook-dtd-dir)/\"/>"
: true ;
- local docbook-xsl-dir = [ boostbook.docbook-xsl-dir ] ;
- if ! $(docbook-xsl-dir)
- {
- ECHO "BoostBook warning: no DocBook XSL directory specified." ;
- ECHO " If you have the DocBook XSL stylesheets installed, please " ;
- ECHO " set DOCBOOK_XSL_DIR to the stylesheet directory on either " ;
- ECHO " the command line (via -sDOCBOOK_XSL_DIR=...) or in a " ;
- ECHO " Boost.Jam configuration file. The DocBook XSL stylesheets " ;
- ECHO " are available here: http://docbook.sourceforge.net/ " ;
- ECHO " Stylesheets will be downloaded on-the-fly (very slow!) " ;
- }
- else
- {
- docbook-xsl-dir = [ format-catalog-path $(docbook-xsl-dir) ] ;
- print.text " <rewriteURI uriStartString=\"http://docbook.sourceforge.net/release/xsl/current/\" rewritePrefix=\"file://$(docbook-xsl-dir)/\"/>" ;
- }
-
- local docbook-dtd-dir = [ boostbook.docbook-dtd-dir ] ;
- if ! $(docbook-dtd-dir)
- {
- ECHO "BoostBook warning: no DocBook DTD directory specified." ;
- ECHO " If you have the DocBook DTD installed, please set " ;
- ECHO " DOCBOOK_DTD_DIR to the DTD directory on either " ;
- ECHO " the command line (via -sDOCBOOK_DTD_DIR=...) or in a " ;
- ECHO " Boost.Jam configuration file. The DocBook DTD is available " ;
- ECHO " here: http://www.oasis-open.org/docbook/xml/4.2/index.shtml" ;
- ECHO " The DTD will be downloaded on-the-fly (very slow!) " ;
- }
- else
- {
- docbook-dtd-dir = [ format-catalog-path $(docbook-dtd-dir) ] ;
- print.text " <rewriteURI uriStartString=\"http://www.oasis-open.org/docbook/xml/4.2/\" rewritePrefix=\"file://$(docbook-dtd-dir)/\"/>" ;
- }
-
+ print.text " <nextCatalog catalog=\"file:///etc/xml/catalog\"/> " ;
print.text "</catalog>" ;
}