From: Daniel Mack <daniel@zonque.org>
Date: Wed, 10 Jun 2015 18:42:56 +0000 (+0200)
Subject: build-sys: make man/systemd.directives.xml depend on man/custom-entities.ent
X-Git-Tag: v221~124^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=747ca69b5d984b130c4b983281f9b51f3b710340;p=thirdparty%2Fsystemd.git

build-sys: make man/systemd.directives.xml depend on man/custom-entities.ent

Currently, the following command sequence fails:

  make distclean
  ./autogen.sh c
  make distcheck

That's because the command invoked to build man/systemd.directives.xml needs
man/custom-entities.ent to function, which itself isn't a dependency.

The $(filter-out $<,$^) logic used to filter out everything from the
prerequisites except for the first word, which doesn't work anymore
now. Use $(SOURCE_XML_FILES) instead.
---

diff --git a/Makefile.am b/Makefile.am
index e98e8b821a6..9b42f23709c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -714,9 +714,9 @@ man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FIL
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
 
-man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE_XML_FILES)
+man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
+	$(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
 
 CLEANFILES += \
 	man/systemd.index.xml \