X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=0f9ef8eabc5bc8d28d5a17b68098c77a6783c969;hb=f9378423b9758861850748aeb49ae0d3300e56e6;hp=ae83c4a44b4b81e6d94bdd7eca23f768222a0124;hpb=8c6db8336536916d0476ff8233e0abf40a2f6aab;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index ae83c4a44..0f9ef8eab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,10 +165,7 @@ EXTRA_DIST = \
 	units/systemd-logger.service.in \
 	units/syslog.target.in \
 	units/session/exit.service.in \
-	LICENSE \
-	README \
-	DISTRO_PORTING \
-	src/systemd.pc.in
+	systemd.pc.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -208,6 +205,8 @@ endif
 
 dist_doc_DATA = \
 	README \
+	LICENSE \
+	DISTRO_PORTING \
 	src/sd-daemon.h \
 	src/sd-daemon.c
 
@@ -307,14 +306,28 @@ EXTRA_DIST += \
 
 dist_man_MANS = \
 	man/systemd.unit.5 \
-	man/systemd.service.5
+	man/systemd.service.5 \
+	man/daemon.7 \
+	man/systemd.8 \
+	man/sd_notify.3 \
+	man/sd_booted.3 \
+	man/sd_listen_fds.3 \
+	man/sd_is_fifo.3 \
+	man/sd-daemon.7
 
 nodist_man_MANS = \
 	man/systemd.special.7
 
 dist_noinst_DATA = \
 	man/systemd.unit.html \
-	man/systemd.service.html
+	man/systemd.service.html \
+	man/daemon.html \
+	man/systemd.html \
+	man/sd_notify.html \
+	man/sd_booted.html \
+	man/sd_listen_fds.html \
+	man/sd_is_fifo.html \
+	man/sd-daemon.html
 
 nodist_noinst_DATA = \
 	man/systemd.special.html
@@ -324,7 +337,14 @@ EXTRA_DIST += \
 	man/systemd.service.xml \
 	man/systemd.special.xml.in \
 	man/systemd.special.7.in \
-	man/systemd.special.html.in
+	man/systemd.special.html.in \
+	man/daemon.xml \
+	man/systemd.xml \
+	man/sd_notify.xml \
+	man/sd_booted.xml \
+	man/sd_listen_fds.xml \
+	man/sd_is_fifo.xml \
+	man/sd-daemon.xml
 
 systemd_SOURCES = \
 	src/main.c
@@ -540,7 +560,8 @@ CLEANFILES = \
 	units/session/remote-fs.target \
 	units/session/exit.service \
 	man/systemd.special.7 \
-	man/systemd.special.html
+	man/systemd.special.html \
+	systemd.pc
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -567,6 +588,12 @@ XSLTPROC_PROCESS_HTML_IN = \
 	$(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
 	mv ${@:.in=} $@
 
+man/%.3: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.3.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN)
+
 man/%.5: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
@@ -579,6 +606,12 @@ man/%.7: man/%.xml
 man/%.7.in: man/%.xml.in
 	$(XSLTPROC_PROCESS_MAN_IN)
 
+man/%.8: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.8.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN_IN)
+
 man/%.html: man/%.xml
 	$(XSLTPROC_PROCESS_HTML)
 
@@ -610,8 +643,8 @@ install-data-hook:
 		$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/session \
 		$(DESTDIR)$(sysconfdir)/xdg/systemd
-	$(MKDIR_P) -m 0755 $(DESTDIR)/cgroup/systemd || \
-		echo "Don't forget to create /cgroup/systemd! Couldn't create it for you, continuing anyway."
+	$(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
+		echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
 	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
 		rm -f session && \
 		$(LN_S) $(pkgsysconfdir)/session session )
@@ -667,6 +700,8 @@ install-data-hook:
 		rm -f org.freedesktop.systemd1.service && \
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if TARGET_FEDORA
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -679,7 +714,7 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f local.service && \
 		$(LN_S) rc-local.service local.service )
-	( cd $(DESTDIR)/etc/init.d && \
+	( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
 		$(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
 if TARGET_GENTOO