From b1bbb18e6eaf408b307f4938157e187765119c2e Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
Date: Fri, 23 Nov 2018 13:33:25 +0000
Subject: SConstruct: fix test for xsltproc, fix xmlto output.

More fallout from moving man pages to man/
---
 SConstruct | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index a8e94688..b38aca0e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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:
-- 
cgit v1.2.1