diff options
| author | Gary E. Miller <gem@rellim.com> | 2018-11-23 13:33:25 +0000 |
|---|---|---|
| committer | Gary E. Miller <gem@rellim.com> | 2018-11-23 13:33:25 +0000 |
| commit | b1bbb18e6eaf408b307f4938157e187765119c2e (patch) | |
| tree | 1fe0fbbf79be489bba47b8ed5eb6b2873231e71b /SConstruct | |
| parent | f5c8e4e75abbf7ba0161fdbacdff6c2ed89d1331 (diff) | |
| download | gpsd-b1bbb18e6eaf408b307f4938157e187765119c2e.tar.gz | |
SConstruct: fix test for xsltproc, fix xmlto output.
More fallout from moving man pages to man/
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -555,8 +555,8 @@ def CheckXsltproc(context): "man/xmltest.xml" % (docbook_man_uri,)) ret = context.TryAction(probe)[0] os.remove("man/xmltest.xml") - if os.path.exists("foo.1"): - os.remove("foo.1") + if os.path.exists("man/foo.1"): + os.remove("man/foo.1") else: # failed to create output ret = False @@ -941,12 +941,11 @@ else: manbuilder = htmlbuilder = None if env['manbuild']: if config.CheckXsltproc(): - build = "xsltproc --output $TARGET --nonet %s $SOURCE " + build = "xsltproc --output $TARGET --nonet %s $SOURCE" htmlbuilder = build % docbook_html_uri manbuilder = build % docbook_man_uri elif WhereIs("xmlto"): - xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \ - "`dirname $TARGET`" + xmlto = "xmlto -o `dirname $TARGET` %s $SOURCE" htmlbuilder = xmlto % "html-nochunks" manbuilder = xmlto % "man" else: |