Commit 185c3be0 authored by Zbigniew Jędrzejewski-Szmek's avatar Zbigniew Jędrzejewski-Szmek
Browse files

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

parent fcc43d01
# Do not edit. Generated by make-man-rules.py. # Do not edit. Generated by make-man-rules.py.
# Regenerate with 'make update-man-list'. # Regenerate with 'make all update-man-list'.
MANPAGES += \ MANPAGES += \
man/bootup.7 \ man/bootup.7 \
......
...@@ -519,7 +519,7 @@ man/index.html: ...@@ -519,7 +519,7 @@ man/index.html:
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES)) 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) update-man-list: make-man-rules.py $(XML_GLOB)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
......
...@@ -21,6 +21,7 @@ from __future__ import print_function ...@@ -21,6 +21,7 @@ from __future__ import print_function
import xml.etree.ElementTree as tree import xml.etree.ElementTree as tree
import collections import collections
import sys import sys
import os
SECTION = '''\ SECTION = '''\
MANPAGES += \\ MANPAGES += \\
...@@ -40,7 +41,7 @@ endif ...@@ -40,7 +41,7 @@ endif
HEADER = '''\ HEADER = '''\
# Do not edit. Generated by make-man-rules.py. # 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): ...@@ -96,7 +97,8 @@ def make_makefile(rules, cleanfiles):
if __name__ == '__main__': if __name__ == '__main__':
sources = set(sys.argv[1:]) sources = set(sys.argv[1:])
basenames = [os.path.basename(source) for source in sources]
spares = set([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)) rules = create_rules(*(sources - spares))
print(make_makefile(rules, spares), end='') print(make_makefile(rules, spares), end='')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment