From 3221e2259968d9378e5278918dbad702ec1f341f Mon Sep 17 00:00:00 2001 From: loonycyborg Date: Tue, 27 Mar 2018 03:20:06 +0300 Subject: [PATCH] scons: look for xhtml.xsl in several dirs as its location can vary --- doc/manual/SConscript | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/manual/SConscript b/doc/manual/SConscript index 638261b2e052..b656e7fd31da 100644 --- a/doc/manual/SConscript +++ b/doc/manual/SConscript @@ -8,6 +8,10 @@ if "manual" in COMMAND_LINE_TARGETS or "update-po4a" in COMMAND_LINE_TARGETS or env.Command("manual.en.xml", "manual.txt", "asciidoc -b docbook -d book -n -a toc -o $TARGET $SOURCE && dos2unix $TARGET") manuals = Glob("*.xml") + env["XHTML_XSL"] = env.FindFile("xhtml.xsl", ["/usr/share/asciidoc/docbook-xsl", "/etc/asciidoc/docbook-xsl", "/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml"]) + if not env["XHTML_XSL"]: + print("Warning: xhtml.xsl not found, needed for generating manual") + env["XHTML_XSL"] = File("xhtml.xsl.not.found") for manual in manuals: html = env.Command(manual.name.replace(".xml", ".html"), manual, """${SOURCES[0].exists() and \ @@ -17,8 +21,8 @@ if "manual" in COMMAND_LINE_TARGETS or "update-po4a" in COMMAND_LINE_TARGETS or --stringparam admon.textlabel 1 \ --stringparam admon.graphics 0 \ --stringparam html.stylesheet ./styles/manual.css \ - /usr/share/asciidoc/docbook-xsl/xhtml.xsl \ - %s > %s' % (SOURCE, TARGET) \ + %s \ + %s > %s' % (XHTML_XSL.path, SOURCE, TARGET) \ or '@echo Skipped non-existant %s' % SOURCE} \ """) env.Alias("manual", html)