man pages

4 files changed, 20 insertions, 6 deletions

diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 256ff3dc5d..1b287997fa 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
 #  This file is part of systemd.
diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index 74a47b821a..abc33e7394 100755
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
 #  This file is part of systemd.
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 0b73ab04f7..1913d44c65 100644..100755
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
 #  This file is part of systemd.
@@ -52,8 +53,13 @@ HEADER = '''\
 # to <refentry> element.
 '''
 
+MAN_ALIAS_RULE = '''\
+$(outdir)/{}: $(outdir)/{}
+	$(sdman.man-alias)
+'''
+
 HTML_ALIAS_RULE = '''\
-{}.html: {}.html
+$(outdir)/{}.html: $(outdir)/{}.html
 	$(sdman.html-alias)
 '''
 
@@ -66,10 +72,10 @@ EXTRA_DIST += \\
 '''
 
 def man(page, number):
-    return 'man/{}.{}'.format(page, number)
+    return '{}.{}'.format(page, number)
 
 def xml(file):
-    return 'man/{}'.format(os.path.basename(file))
+    return '{}'.format(os.path.basename(file))
 
 def add_rules(rules, name):
     xml = xml_parse(name)
@@ -111,7 +117,7 @@ def make_makefile(rules, dist_files):
         (CONDITIONAL if conditional else SECTION).format(
             manpages=mjoin(set(rulegroup.values())),
             aliases=mjoin(k for k,v in rulegroup.items() if k != v),
-            rules='\n'.join('{}: {}'.format(k,v)
+            rules='\n'.join(MAN_ALIAS_RULE.format(k,v)
                             for k,v in sorted(rulegroup.items())
                             if k != v),
             htmlrules='\n'.join(HTML_ALIAS_RULE.format(k[:-2],v[:-2])
diff --git a/tools/xml_helper.py b/tools/xml_helper.py
index e87126f2f7..07353847ba 100644
--- a/tools/xml_helper.py
+++ b/tools/xml_helper.py
@@ -18,11 +18,17 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 from lxml import etree as tree
+import os.path
 
 class CustomResolver(tree.Resolver):
     def resolve(self, url, id, context):
-        if 'custom-entities.ent' in url:
-            return self.resolve_filename('man/custom-entities.ent', context)
+        if not os.path.exists(url):
+            srcdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            basename = os.path.basename(url)
+            if basename == 'custom-entities.ent':
+                basename = 'custom-entities.ent.in'
+            url = os.path.join(srcdir, 'man', basename)
+        return self.resolve_filename(url, context)
 
 _parser = tree.XMLParser()
 _parser.resolvers.add(CustomResolver())