Merge branch 'baserock/larswirzenius/update-to-master' into baserock/morphbaserock/morph

Reviewed-by: Jonathan Maw
Reviewed-by: Daniel Silverstone

1 files changed, 0 insertions, 33 deletions

diff --git a/Makefile-docbook-man.am b/Makefile-docbook-man.am
deleted file mode 100644
index 4bdb501..0000000
--- a/Makefile-docbook-man.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#  Docbook generation copied from systemd/Makefile.am
-#
-#  Copyright 2010 Lennart Poettering
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-XML_FILES = \
-	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
-EXTRA_DIST += $(XML_FILES)
-
-dist_man_MANS = $(MANPAGES)
-
-XSLTPROC_FLAGS = \
-	--nonet \
-	--param funcsynopsis.style "'ansi'"
-
-XSLTPROC_PROCESS_MAN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-doc/%.1: doc/%.xml
-	$(XSLTPROC_PROCESS_MAN)