24 files changed, 15 insertions, 7 deletions
diff --git a/DocBook/Fonts/Delicious/Delicious-Bold.ttf b/BuildTools/DocBook/Fonts/Delicious/Delicious-Bold.ttf
index 692f10c..692f10c 100644
--- a/DocBook/Fonts/Delicious/Delicious-Bold.ttf
+++ b/BuildTools/DocBook/Fonts/Delicious/Delicious-Bold.ttf
diff --git a/DocBook/Fonts/Delicious/Delicious-BoldItalic.ttf b/BuildTools/DocBook/Fonts/Delicious/Delicious-BoldItalic.ttf
index 04c68ab..04c68ab 100644
--- a/DocBook/Fonts/Delicious/Delicious-BoldItalic.ttf
+++ b/BuildTools/DocBook/Fonts/Delicious/Delicious-BoldItalic.ttf
diff --git a/DocBook/Fonts/Delicious/Delicious-Heavy.ttf b/BuildTools/DocBook/Fonts/Delicious/Delicious-Heavy.ttf
index ac224e8..ac224e8 100644
--- a/DocBook/Fonts/Delicious/Delicious-Heavy.ttf
+++ b/BuildTools/DocBook/Fonts/Delicious/Delicious-Heavy.ttf
diff --git a/DocBook/Fonts/Delicious/Delicious-Italic.ttf b/BuildTools/DocBook/Fonts/Delicious/Delicious-Italic.ttf
index 7ce4e15..7ce4e15 100644
--- a/DocBook/Fonts/Delicious/Delicious-Italic.ttf
+++ b/BuildTools/DocBook/Fonts/Delicious/Delicious-Italic.ttf
diff --git a/DocBook/Fonts/Delicious/Delicious-Roman.ttf b/BuildTools/DocBook/Fonts/Delicious/Delicious-Roman.ttf
index 14349dc..14349dc 100644
--- a/DocBook/Fonts/Delicious/Delicious-Roman.ttf
+++ b/BuildTools/DocBook/Fonts/Delicious/Delicious-Roman.ttf
diff --git a/DocBook/Fonts/Delicious/Delicious-SmallCaps.ttf b/BuildTools/DocBook/Fonts/Delicious/Delicious-SmallCaps.ttf
index 4389995..4389995 100644
--- a/DocBook/Fonts/Delicious/Delicious-SmallCaps.ttf
+++ b/BuildTools/DocBook/Fonts/Delicious/Delicious-SmallCaps.ttf
diff --git a/DocBook/Fonts/Gentium Basic/GenBasB.ttf b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasB.ttf
index 0538a00..0538a00 100644
--- a/DocBook/Fonts/Gentium Basic/GenBasB.ttf
+++ b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasB.ttf
diff --git a/DocBook/Fonts/Gentium Basic/GenBasBI.ttf b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasBI.ttf
index 786c627..786c627 100644
--- a/DocBook/Fonts/Gentium Basic/GenBasBI.ttf
+++ b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasBI.ttf
diff --git a/DocBook/Fonts/Gentium Basic/GenBasI.ttf b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasI.ttf
index e326cd7..e326cd7 100644
--- a/DocBook/Fonts/Gentium Basic/GenBasI.ttf
+++ b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasI.ttf
diff --git a/DocBook/Fonts/Gentium Basic/GenBasR.ttf b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasR.ttf
index 6f37980..6f37980 100644
--- a/DocBook/Fonts/Gentium Basic/GenBasR.ttf
+++ b/BuildTools/DocBook/Fonts/Gentium Basic/GenBasR.ttf
diff --git a/DocBook/Fonts/Gentium Basic/OFL.txt b/BuildTools/DocBook/Fonts/Gentium Basic/OFL.txt
index 2c09f25..2c09f25 100644
--- a/DocBook/Fonts/Gentium Basic/OFL.txt
+++ b/BuildTools/DocBook/Fonts/Gentium Basic/OFL.txt
diff --git a/DocBook/SCons/DocBook.py b/BuildTools/DocBook/SCons/DocBook.py
index 8d0b171..d3ef7c5 100644
--- a/DocBook/SCons/DocBook.py
+++ b/BuildTools/DocBook/SCons/DocBook.py
@@ -7,7 +7,7 @@ import xml.dom.minidom, re, os.path, sys
 
 def generate(env) :
   # Location of stylesheets and catalogs
-  docbook_dir = "#/DocBook"
+  docbook_dir = "#/BuildTools/DocBook"
   docbook_xsl_style_dir = env.Dir(docbook_dir + "/Stylesheets").abspath
   docbook_xml_catalog = env.File("catalog.xml").abspath
   docbook_xml_dir = env.Dir("#/3rdParty/DocBook/XML").abspath
@@ -57,10 +57,18 @@ def generate(env) :
     db_env["XMLCATALOGS"] = [docbook_xml_catalog]
     db_env["ENV"].update({"OS" : os.environ.get("OS", "")})
 
+    db_env["XMLLINT"] = env.WhereIs("xmllint")
+    db_env["XSLT"] = env.WhereIs("xsltproc")
+    db_env["FO"] = env.WhereIs("fop")
+
+    if not db_env["XMLLINT"] or not db_env["XSLT"] :
+      return
+
     # PDF generation
-    fo = db_env.XSLT(os.path.splitext(source)[0] + ".fo", source, 
-        XSLTSTYLESHEET = db_env["DOCBOOK_XSL_FO"])
-    pdf = db_env.FO(fo)
+    if db_env["FO"] :
+      fo = db_env.XSLT(os.path.splitext(source)[0] + ".fo", source, 
+          XSLTSTYLESHEET = db_env["DOCBOOK_XSL_FO"])
+      pdf = db_env.FO(fo)
 
     # HTML generation
     db_env.XSLT(os.path.splitext(source)[0] + ".html", source, 
diff --git a/DocBook/SCons/FO.py b/BuildTools/DocBook/SCons/FO.py
index c7596d6..c7596d6 100644
--- a/DocBook/SCons/FO.py
+++ b/BuildTools/DocBook/SCons/FO.py
diff --git a/DocBook/SCons/XSLT.py b/BuildTools/DocBook/SCons/XSLT.py
index 83b5ec2..83b5ec2 100644
--- a/DocBook/SCons/XSLT.py
+++ b/BuildTools/DocBook/SCons/XSLT.py
diff --git a/DocBook/Stylesheets/common/inline.xsl b/BuildTools/DocBook/Stylesheets/common/inline.xsl
index 5f39338..5f39338 100644
--- a/DocBook/Stylesheets/common/inline.xsl
+++ b/BuildTools/DocBook/Stylesheets/common/inline.xsl
diff --git a/DocBook/Stylesheets/common/params.xsl b/BuildTools/DocBook/Stylesheets/common/params.xsl
index 6da03c0..6da03c0 100644
--- a/DocBook/Stylesheets/common/params.xsl
+++ b/BuildTools/DocBook/Stylesheets/common/params.xsl
diff --git a/DocBook/Stylesheets/fo/component.xsl b/BuildTools/DocBook/Stylesheets/fo/component.xsl
index 829695d..829695d 100644
--- a/DocBook/Stylesheets/fo/component.xsl
+++ b/BuildTools/DocBook/Stylesheets/fo/component.xsl
diff --git a/DocBook/Stylesheets/fo/docbook.test.xsl b/BuildTools/DocBook/Stylesheets/fo/docbook.test.xsl
index c6d6106..c6d6106 100644
--- a/DocBook/Stylesheets/fo/docbook.test.xsl
+++ b/BuildTools/DocBook/Stylesheets/fo/docbook.test.xsl
diff --git a/DocBook/Stylesheets/fo/docbook.xsl b/BuildTools/DocBook/Stylesheets/fo/docbook.xsl
index 1a27317..1a27317 100644
--- a/DocBook/Stylesheets/fo/docbook.xsl
+++ b/BuildTools/DocBook/Stylesheets/fo/docbook.xsl
diff --git a/DocBook/Stylesheets/fo/inline.xsl b/BuildTools/DocBook/Stylesheets/fo/inline.xsl
index adb03a7..adb03a7 100644
--- a/DocBook/Stylesheets/fo/inline.xsl
+++ b/BuildTools/DocBook/Stylesheets/fo/inline.xsl
diff --git a/DocBook/Stylesheets/fo/titlepage.xsl b/BuildTools/DocBook/Stylesheets/fo/titlepage.xsl
index 304c7f8..304c7f8 100644
--- a/DocBook/Stylesheets/fo/titlepage.xsl
+++ b/BuildTools/DocBook/Stylesheets/fo/titlepage.xsl
diff --git a/DocBook/Stylesheets/html/docbook.xsl b/BuildTools/DocBook/Stylesheets/html/docbook.xsl
index c97545e..c97545e 100644
--- a/DocBook/Stylesheets/html/docbook.xsl
+++ b/BuildTools/DocBook/Stylesheets/html/docbook.xsl
diff --git a/Documentation/SConscript b/Documentation/SConscript
index 45dd35a..f4d22db 100644
--- a/Documentation/SConscript
+++ b/Documentation/SConscript
@@ -1,4 +1,4 @@
 Import("env")
 
-#if env["SCONS_STAGE"] == "build" :
-#	SConscript(dirs = ["SwiftenDevelopersGuide"])
+if env["SCONS_STAGE"] == "build" :
+	SConscript(dirs = ["SwiftenDevelopersGuide"])
diff --git a/Documentation/SwiftenDevelopersGuide/SConscript b/Documentation/SwiftenDevelopersGuide/SConscript
index 5e19a05..3aec8d0 100644
--- a/Documentation/SwiftenDevelopersGuide/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/SConscript
@@ -1,5 +1,5 @@
 Import("env")
 
-env.Tool("DocBook", toolpath = ["#/DocBook/SCons"])
+env.Tool("DocBook", toolpath = ["#/BuildTools/DocBook/SCons"])
 
 env.DocBook("SwiftenDevelopersGuide.xml")