X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=33188294a955cf65eae0dbb97182b1662658a45b;hp=474110a6e586923954e1549ef7c39c8f49fd77df;hb=748ebafa7a10d4e1f168dd8ae0193124cdf4226e;hpb=dee4c244254bb49d1ffa8bd7171ae9cce596d2d0

diff --git a/Makefile.am b/Makefile.am
index 474110a6e..33188294a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -377,24 +377,22 @@ EXTRA_DIST += \
 	introspect.awk \
 	man/custom-html.xsl
 
-if HAVE_KMOD
 EXTRA_DIST += \
 	units/systemd-modules-load.service.in
-endif
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
 	units/rc-local.service \
 	units/halt-local.service
 
-EXTRA_DIST += \
-	units/rc-local.service.in \
-	units/halt-local.service.in
-
 systemgenerator_PROGRAMS += \
 	systemd-rc-local-generator
 endif
 
+EXTRA_DIST += \
+	units/rc-local.service.in \
+	units/halt-local.service.in
+
 dist_doc_DATA = \
 	README \
 	NEWS \
@@ -769,6 +767,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/strv.h \
 	src/shared/strbuf.c \
 	src/shared/strbuf.h \
+	src/shared/strxcpyx.c \
+	src/shared/strxcpyx.h \
 	src/shared/conf-parser.c \
 	src/shared/conf-parser.h \
 	src/shared/log.c \
@@ -3027,11 +3027,14 @@ systemd_bootchart_SOURCES = \
 	src/bootchart/svg.c
 
 MANPAGES += \
-	man/systemd-bootchart.1
+	man/systemd-bootchart.1 \
 	man/bootchart.conf.5
 
 rootlibexec_PROGRAMS += \
 	systemd-bootchart
+
+dist_pkgsysconf_DATA += \
+	src/bootchart/bootchart.conf
 endif
 
 # ------------------------------------------------------------------------------
@@ -3939,16 +3942,16 @@ docs/sysvinit/README: docs/sysvinit/README.in
 docs/var-log/README: docs/var-log/README.in
 	$(SED_PROCESS)
 
-EXTRA_DIST += \
-	docs/sysvinit/README.in \
-	docs/var-log/README.in
-
 CLEANFILES += \
 	docs/sysvinit/README \
 	docs/var-log/README
 
 endif
 
+EXTRA_DIST += \
+	docs/sysvinit/README.in \
+	docs/var-log/README.in
+
 EXTRA_DIST += \
 	shell-completion/systemd-zsh-completion.zsh
 
@@ -4102,11 +4105,14 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr
 
-
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
 	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
 	--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+	--with-sysvinit-path= \
+	--with-sysvrcnd-path=
 endif
 
 if ENABLE_GTK_DOC