man: replace syslog name in man page by configured name

5 files changed, 93 insertions, 66 deletions

diff --git a/Makefile.am b/Makefile.am
index 77274891da..2a0d6bb358 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,21 +186,24 @@ EXTRA_DIST += \
 
 dist_man_MANS = \
 	man/systemd.unit.5 \
-	man/systemd.service.5 \
+	man/systemd.service.5
+
+nodist_man_MANS = \
 	man/systemd.special.7
 
-HTMLMANS = \
+dist_noinst_DATA = \
 	man/systemd.unit.html \
-	man/systemd.service.html \
-	man/systemd.special.html
+	man/systemd.service.html
 
-dist_noinst_DATA = \
-	$(HTMLMANS)
+nodist_noinst_DATA = \
+	man/systemd.special.html
 
 EXTRA_DIST += \
 	man/systemd.unit.xml \
 	man/systemd.service.xml \
-	man/systemd.special.xml
+	man/systemd.special.xml.in \
+	man/systemd.special.7.in \
+	man/systemd.special.html.in
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -311,39 +314,27 @@ SED_PROCESS = \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		< $< > $@
 
-units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
+units/%: units/%.in Makefile
 	$(SED_PROCESS)
 
-units/systemd-logger.service: units/systemd-logger.service.in Makefile
+man/%.html: $(builddir)/man/%.html.in Makefile
 	$(SED_PROCESS)
 
-units/syslog.target: units/syslog.target.in Makefile
+man/%.7: $(builddir)/man/%.7.in Makefile
 	$(SED_PROCESS)
 
 M4_PROCESS_SYSTEM = \
 	$(AM_V_GEN)$(MKDIR_P) units && \
-	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM < $< > $@
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
 
 M4_PROCESS_SESSION = \
 	$(AM_V_GEN)$(MKDIR_P) units/session && \
-	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION < $< > $@
-
-units/basic.target: units/basic.target.m4 Makefile
-	$(M4_PROCESS_SYSTEM)
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
 
-units/graphical.target: units/graphical.target.m4 Makefile
+units/%: units/%.m4 Makefile
 	$(M4_PROCESS_SYSTEM)
 
-units/multi-user.target: units/multi-user.target.m4 Makefile
-	$(M4_PROCESS_SYSTEM)
-
-units/getty@.service: units/getty@.service.m4 Makefile
-	$(M4_PROCESS_SYSTEM)
-
-units/remote-fs.target: units/remote-fs.target.m4 Makefile
-	$(M4_PROCESS_SYSTEM)
-
-units/session/remote-fs.target: units/remote-fs.target.m4 Makefile
+units/session/%: units/%.m4 Makefile
 	$(M4_PROCESS_SESSION)
 
 CLEANFILES = \
@@ -358,21 +349,54 @@ CLEANFILES = \
 	units/graphical.target \
 	units/multi-user.target \
 	units/remote-fs.target \
-	units/session/remote-fs.target
+	units/session/remote-fs.target \
+	man/systemd.special.7 \
+	man/systemd.special.html
 
-if HAVE_XSLTPROC
-man/%.5 man/%.7: man/%.xml
+#if HAVE_XSLTPROC
+XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) man && \
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-man/%.html: man/%.xml
+XSLTPROC_PROCESS_MAN_IN = \
+	$(AM_V_GEN)$(MKDIR_P) man && \
+	$(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+	mv ${@:.in=} $@
+
+XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) man && \
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
+XSLTPROC_PROCESS_HTML_IN = \
+	$(AM_V_GEN)$(MKDIR_P) man && \
+	$(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+	mv ${@:.in=} $@
+
+man/%.5: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.5.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.7: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.7.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN_IN)
+
+man/%.html: man/%.xml
+	$(XSLTPROC_PROCESS_HTML)
+
+man/%.html.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_HTML_IN)
+
 CLEANFILES += \
 	$(dist_man_MANS) \
-	$(HTMLMANS)
-endif
+	man/systemd.special.7.in \
+	man/systemd.unit.html \
+	man/systemd.service.html \
+	man/systemd.special.html.in
+#endif
 
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -437,6 +461,5 @@ if TARGET_FEDORA
 		$(LN_S) rc-local.service local.service )
 endif
 
-
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
diff --git a/configure.ac b/configure.ac
index 9eec8016bb..b562c003aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,7 +144,7 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
 
 AC_PATH_PROG([M4], [m4])
 
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo or other]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo, slackware or other]))
 if test "z$with_distro" = "z"; then
         if test "$cross_compiling" = yes; then
                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000000..b127cf1361
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+systemd.special.7.in
+systemd.special.html.in
diff --git a/man/systemd.special.xml b/man/systemd.special.xml.in
index e81e99e44e..da474b7477 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml.in
@@ -48,38 +48,39 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>basic.target</filename></para>
-                <para><filename>ctrl-alt-del.target</filename></para>
-                <para><filename>default.target</filename></para>
-                <para><filename>emergency.service</filename></para>
-                <para><filename>graphical.target</filename></para>
-                <para><filename>halt.target</filename></para>
-                <para><filename>kbrequest.target</filename></para>
-                <para><filename>local-fs.target</filename></para>
-                <para><filename>multi-user.target</filename></para>
-                <para><filename>network.target</filename></para>
-                <para><filename>nss-lookup.target</filename></para>
-                <para><filename>poweroff.target</filename></para>
-                <para><filename>reboot.target</filename></para>
-                <para><filename>remote-fs.target</filename></para>
-                <para><filename>rescue.target</filename></para>
-                <para><filename>rpcbind.target</filename></para>
-                <para><filename>rtc-set.target</filename></para>
-                <para><filename>runlevel0.target</filename>,
-                        <filename>runlevel0.target</filename>,
-                        <filename>runlevel1.target</filename>,
-                        <filename>runlevel2.target</filename>,
-                        <filename>runlevel3.target</filename>,
-                        <filename>runlevel4.target</filename>,
-                        <filename>runlevel5.target</filename>,
-                        <filename>runlevel6.target</filename></para>
-                <para><filename>shutdown.target</filename></para>
-                <para><filename>sigpwr.target</filename></para>
-                <para><filename>sockets.target</filename></para>
-                <para><filename>swap.target</filename></para>
-                <para><filename>syslog.target</filename></para>
-                <para><filename>systemd-initctl.service</filename>, <filename>systemd-initctl.socket</filename></para>
-                <para><filename>systemd-logger.service</filename>, <filename>systemd-logger.socket</filename></para>
+                <para><filename>basic.target</filename>,
+                <filename>ctrl-alt-del.target</filename>,
+                <filename>default.target</filename>,
+                <filename>emergency.service</filename>,
+                <filename>graphical.target</filename>,
+                <filename>halt.target</filename>,
+                <filename>kbrequest.target</filename>,
+                <filename>local-fs.target</filename>,
+                <filename>multi-user.target</filename>,
+                <filename>network.target</filename>,
+                <filename>nss-lookup.target</filename>,
+                <filename>poweroff.target</filename>,
+                <filename>reboot.target</filename>,
+                <filename>remote-fs.target</filename>,
+                <filename>rescue.target</filename>,
+                <filename>rpcbind.target</filename>,
+                <filename>rtc-set.target</filename>,
+                <filename>runlevel0.target</filename>,
+                <filename>runlevel1.target</filename>,
+                <filename>runlevel2.target</filename>,
+                <filename>runlevel3.target</filename>,
+                <filename>runlevel4.target</filename>,
+                <filename>runlevel5.target</filename>,
+                <filename>runlevel6.target</filename>
+                <filename>shutdown.target</filename>,
+                <filename>sigpwr.target</filename>,
+                <filename>sockets.target</filename>,
+                <filename>swap.target</filename>,
+                <filename>syslog.target</filename>,
+                <filename>systemd-initctl.service</filename>,
+                <filename>systemd-initctl.socket</filename>,
+                <filename>systemd-logger.service</filename>,
+                <filename>systemd-logger.socket</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 4f71ffda77..73dde5aa4f 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -108,6 +108,7 @@
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                           <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                           <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                           <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>