From dcea4231ef39624f193c97a28212942cb15903c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= Date: Fri, 20 Sep 2013 13:32:03 -0400 Subject: [PATCH] extras: rst: also build rst2html from the folder in which the target is built --- waflib/extras/rst.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/waflib/extras/rst.py b/waflib/extras/rst.py index d7b09adc..f678a581 100644 --- a/waflib/extras/rst.py +++ b/waflib/extras/rst.py @@ -121,8 +121,9 @@ class rst2html(docutils): return nodes, names def run(self): - src = self.inputs[0].bldpath() - dst = self.outputs[0].bldpath() + cwdn = self.outputs[0].parent + src = self.inputs[0].path_from(cwdn) + dst = self.outputs[0].path_from(cwdn) cmd = self.command + [src, dst] cmd += Utils.to_list(getattr(self.generator, 'options', [])) @@ -130,9 +131,9 @@ class rst2html(docutils): stylesheet = getattr(self.generator, attribute, None) if stylesheet is not None: stylesheet = self.generator.to_nodes(stylesheet)[0] - cmd += ['--%s' % attribute, stylesheet.bldpath()] + cmd += ['--%s' % attribute, stylesheet.path_from(cwdn)] - return self.exec_command(cmd) + return self.exec_command(cmd, cwd=cwdn.abspath()) class rst2s5(rst2html): def __init__(self, *args, **kw):