Skip to content

Commit

Permalink
build-sys: don't dist man/systemd.directives.xml
Browse files Browse the repository at this point in the history
It depends on man/custom-entities.ent which is (and needs to be) a built file,
so we need to always build man/systemd.directives.xml as well.

We also need to drop this from update-man-list so that it doesn't get disted
from Makefile-man.am.

Fixes distcheck failure.

systemd#215
  • Loading branch information
martinpitt committed Jun 18, 2015
1 parent 4584eae commit b40d3a6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 0 additions & 2 deletions Makefile-man.am
Original file line number Diff line number Diff line change
Expand Up @@ -2142,10 +2142,8 @@ EXTRA_DIST += \
man/systemd-vconsole-setup.service.xml \
man/systemd.automount.xml \
man/systemd.device.xml \
man/systemd.directives.xml \
man/systemd.exec.xml \
man/systemd.generator.xml \
man/systemd.index.xml \

This comment has been minimized.

Copy link
@zonque

zonque Jun 18, 2015

Why drop index.xml?

This comment has been minimized.

Copy link
@martinpitt

martinpitt Jun 18, 2015

Author Owner

update-man-list now uses $(SOURCE_XML_FILES) which doesn't contain systemd.index.xml. It's built in Makefile.am similar to man/systemd.directives.xml? If we want to dist/keep it, we need to adjust update-man-list to keep it as a dependency.

man/systemd.journal-fields.xml \
man/systemd.kill.xml \
man/systemd.link.xml \
Expand Down
5 changes: 2 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}

update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)

This comment has been minimized.

Copy link
@zonque

zonque Jun 18, 2015

After this, XML_GLOB has no users anymore and could be removed, right?

update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
@echo "Makefile-man.am has been regenerated"
Expand All @@ -726,7 +726,7 @@ endif
endif

EXTRA_DIST += \
$(XML_FILES) \
$(filter-out man/systemd.directives.xml,$(XML_FILES)) \
$(HTML_FILES) \
$(HTML_ALIAS) \
$(man_MANS) \
Expand All @@ -735,7 +735,6 @@ EXTRA_DIST += \
tools/xml_helper.py \
man/systemd.index.xml \
man/index.html \
man/systemd.directives.xml \
man/glib-event-glue.c \
$(NULL)

Expand Down

1 comment on commit b40d3a6

@martinpitt
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, I somehow mis-read that NON_INDEX_XML_FILES would use it, but it doesn't. Amended, and force-pushed.

Please sign in to comment.