Merge pull request #282 from martinpitt/master

Fix out-of-tree builds and distcheck

2 files changed, 3 insertions, 7 deletions

diff --git a/Makefile-man.am b/Makefile-man.am
index 7d31800345..76c9389835 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -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 \
 	man/systemd.journal-fields.xml \
 	man/systemd.kill.xml \
 	man/systemd.link.xml \
diff --git a/Makefile.am b/Makefile.am
index 7dc57b18da..532d5eeb86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -700,11 +700,10 @@ noinst_DATA += \
 CLEANFILES += \
 	man/index.html
 
-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 = $(filter-out man/systemd.directives.xml,$(NON_INDEX_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)
+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"
@@ -726,7 +725,7 @@ endif
 endif
 
 EXTRA_DIST += \
-	$(XML_FILES) \
+	$(filter-out man/systemd.directives.xml,$(XML_FILES)) \
 	$(HTML_FILES) \
 	$(HTML_ALIAS) \
 	$(man_MANS) \
@@ -735,7 +734,6 @@ EXTRA_DIST += \
 	tools/xml_helper.py \
 	man/systemd.index.xml \
 	man/index.html \
-	man/systemd.directives.xml \
 	man/glib-event-glue.c \
 	$(NULL)