picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #282 from martinpitt/master

Browse source 
Fix out-of-tree builds and distcheck
This commit is contained in:
Daniel Mack 2015-06-18 16:01:58 +02:00
parent eedb4ac831 65d21ff344
commit 5617dde9ac
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile-man.am
View file

@ -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 \

8
Makefile.am
View file

@ -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)