X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=6d211404fe49608564dcedbb2cbfa1f01863b44d;hb=0bb91b50100e4633a0e68135854e606653055748;hp=be97193b456d8a4f7dedae5709a00cb28fdfdcbf;hpb=8d7e170a5230753d8406276f8b5598e5bb6766e6;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index be97193b4..6d211404f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
+userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
+systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
@@ -469,7 +471,7 @@ MANPAGES = \
 	man/systemd.conf.5 \
 	man/tmpfiles.d.5 \
 	man/hostname.5 \
-	man/timezone.5 \
+	man/localtime.5 \
 	man/machine-id.5 \
 	man/locale.conf.5 \
 	man/os-release.5 \
@@ -682,8 +684,36 @@ man/index.html: make-man-index.py $(XML_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(PYTHON) $^ > $@
 
+MANPAGES += \
+	man/systemd.directives.5
+
 EXTRA_DIST += \
 	man/index.html
+
+XML_DIRECTIVE_FILES = \
+	man/systemd.unit.xml \
+	man/systemd.service.xml \
+	man/systemd.socket.xml \
+	man/systemd.mount.xml \
+	man/systemd.automount.xml \
+	man/systemd.swap.xml \
+	man/systemd.target.xml \
+	man/systemd.path.xml \
+	man/systemd.timer.xml \
+	man/systemd.snapshot.xml \
+	man/systemd.exec.xml \
+	man/systemd.kill.xml \
+	man/systemd.device.xml \
+	man/systemd.conf.xml \
+	man/systemd.journal-fields.xml
+
+man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $^ > $@
+
+EXTRA_DIST += \
+	man/systemd.directives.xml
+
 endif
 
 endif
@@ -693,7 +723,8 @@ EXTRA_DIST += \
 	${XML_FILES:.xml=.html} \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS) \
-	make-man-index.py
+	make-man-index.py \
+	make-directive-index.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1706,6 +1737,7 @@ dist_udevrules_DATA += \
 	rules/60-persistent-input.rules \
 	rules/60-persistent-alsa.rules \
 	rules/60-persistent-storage.rules \
+	rules/64-btrfs.rules \
 	rules/75-net-description.rules \
 	rules/75-tty-description.rules \
 	rules/78-sound-card.rules \
@@ -1766,6 +1798,7 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-ctrl.c \
 	src/udev/udev-builtin.c \
 	src/udev/udev-builtin-blkid.c \
+	src/udev/udev-builtin-btrfs.c \
 	src/udev/udev-builtin-firmware.c \
 	src/udev/udev-builtin-hwdb.c \
 	src/udev/udev-builtin-input_id.c \
@@ -3450,6 +3483,8 @@ SED_PROCESS = \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
 		-e 's,@userunitdir\@,$(userunitdir),g' \
+		-e 's,@systempresetdir\@,$(systempresetdir),g' \
+		-e 's,@userpresetdir\@,$(userpresetdir),g' \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \