summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLudwig Hähne <pankrat@tigris.org>2008-08-24 09:40:48 (GMT)
committerLudwig Hähne <pankrat@tigris.org>2008-08-24 09:40:48 (GMT)
commit010de33d84cc61f2f6252a101ebc801c9a1ac876 (patch)
tree63e1896ac2575dbdab16f478bf9dc027f4aa3caf /doc
parentb3fc89a8841dbf3bb16fe51d04bb7872f20b83a0 (diff)
downloadSCons-010de33d84cc61f2f6252a101ebc801c9a1ac876.zip
SCons-010de33d84cc61f2f6252a101ebc801c9a1ac876.tar.gz
SCons-010de33d84cc61f2f6252a101ebc801c9a1ac876.tar.bz2
Issue 2151: Enforce building doc PDF and PS with jade
Diffstat (limited to 'doc')
-rw-r--r--doc/SConscript11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/SConscript b/doc/SConscript
index a2174ea..e33069e 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -49,7 +49,8 @@ epydoc = whereis('epydoc')
groff = whereis('groff')
lynx = whereis('lynx')
man2html = whereis('man2html')
-jade = whereis('openjade') or whereis('jade')
+jade_original = whereis('jade')
+jade = whereis('openjade') or jade_original
jadetex = whereis('jadetex')
pdfjadetex = whereis('pdfjadetex')
jw = whereis('jw')
@@ -343,10 +344,10 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
src = os.path.join(build, doc, g)
Local(env.Install(htmldir, src))
- if docs[doc].get('ps') and jadetex:
+ if docs[doc].get('ps') and jadetex and jade_original:
env.Command(ps, main, [
Delete("${TARGET.dir}/%s" % out),
- "jw -b ps -o ${TARGET.dir} $SOURCES",
+ "jw -b ps -p %s -o ${TARGET.dir} $SOURCES" % jade_original,
"mv ${TARGET.dir}/main.ps $TARGET",
Delete("${TARGET.dir}/%s" % out),
])
@@ -373,10 +374,10 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
src = os.path.join(build, doc, g)
Local(env.Install(htmldir, src))
- if docs[doc].get('pdf') and pdfjadetex:
+ if docs[doc].get('pdf') and pdfjadetex and jade_original:
env.Command(pdf, main, [
Delete("${TARGET.dir}/%s" % out),
- "jw -b pdf -o ${TARGET.dir} $SOURCES",
+ "jw -b pdf -p %s -o ${TARGET.dir} $SOURCES" % jade_original,
"mv ${TARGET.dir}/main.pdf $TARGET",
Delete("${TARGET.dir}/out"),
])