build-sys: fix update-man-rules for vpath builds

diff --git a/Makefile-man.am b/Makefile-man.am
index 526c05d52132ee6f6c907432b24b397cd03deb8e..9a2f2f55046291defa24d765ecae90eda851184a 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1,5 +1,5 @@
 # Do not edit. Generated by make-man-rules.py.
-# Regenerate with 'make update-man-list'.
+# Regenerate with 'make all update-man-list'.
 
 MANPAGES += \
        man/bootup.7 \

diff --git a/Makefile.am b/Makefile.am
index e0c8529e8e4a44a8190679492660005285175ac4..cc0d4da22fed32ecb1e7b34a8805ccbae3d99023 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -519,7 +519,7 @@ man/index.html:
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in $(top_builddir)/man/*.xml)
 update-man-list: make-man-rules.py $(XML_GLOB)
        $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am

diff --git a/make-man-rules.py b/make-man-rules.py
index 9c50c8dec2d0af8bf8736cee9730bd8b4c398231..5415984d88e3f4c88e849d5954c76041a5f21bac 100644 (file)
--- a/make-man-rules.py
+++ b/make-man-rules.py
@@ -21,6 +21,7 @@ from __future__ import print_function
 import xml.etree.ElementTree as tree
 import collections
 import sys
+import os
 
 SECTION = '''\
 MANPAGES += \\
@@ -40,7 +41,7 @@ endif
 
 HEADER = '''\
 # Do not edit. Generated by make-man-rules.py.
-# Regenerate with 'make update-man-list'.
+# Regenerate with 'make all update-man-list'.
 
 '''
 
@@ -96,7 +97,8 @@ def make_makefile(rules, cleanfiles):
 
 if __name__ == '__main__':
     sources = set(sys.argv[1:])
+    basenames = [os.path.basename(source) for source in sources]
     spares = set([source for source in sources
-                  if source + '.in' in sources])
+                  if os.path.basename(source) + '.in' in basenames])
     rules = create_rules(*(sources - spares))
     print(make_makefile(rules, spares), end='')