41 files changed, 56 insertions, 36 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
new file mode 100644
index 00000000..d2f31ca0
--- /dev/null
+++ b/Makefile-man.am
@@ -0,0 +1,54 @@
+# Makefile for man/
+#
+# Copyright (C) 2016 Colin Walters <walters@verbum.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+man1_files = ostree.1 ostree-admin-cleanup.1 ostree-admin-config-diff.1 ostree-admin-deploy.1 ostree-admin-init-fs.1 ostree-admin-instutil.1 ostree-admin-os-init.1 ostree-admin-status.1 ostree-admin-set-origin.1 ostree-admin-switch.1 ostree-admin-undeploy.1 ostree-admin-upgrade.1 ostree-admin.1 ostree-cat.1 ostree-checkout.1 ostree-checksum.1 ostree-commit.1 ostree-gpg-sign.1 ostree-config.1 ostree-diff.1 ostree-fsck.1 ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 ostree-rev-parse.1 ostree-show.1 ostree-summary.1 ostree-static-delta.1 ostree-trivial-httpd.1
+
+man5_files = ostree.repo.5 ostree.repo-config.5
+
+man1_MANS = $(addprefix man/,$(man1_files))
+man5_MANS = $(addprefix man/,$(man5_files))
+
+EXTRA_DIST += $(man1_MANS) $(man5_MANS)
+
+if ENABLE_XSLTPROC
+
+XSLT_STYLESHEET = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+
+XSLTPROC_FLAGS = \
+        --nonet \
+        --stringparam man.output.quietly 1 \
+        --stringparam funcsynopsis.style ansi \
+        --stringparam man.th.extra1.suppress 1 \
+        --stringparam man.authors.section.enabled 0 \
+        --stringparam man.copyright.section.enabled 0
+
+XSLTPROC_MAN = $(XSLTPROC) $(XSLTPROC_FLAGS)
+
+%.1: %.xml
+	$(AM_V_GEN) $(XSLTPROC_MAN) --output $@ $(XSLT_STYLESHEET) $<
+
+%.5: %.xml
+	$(AM_V_GEN) $(XSLTPROC_MAN) --output $@ $(XSLT_STYLESHEET) $<
+
+CLEANFILES += \
+	$(man1_MANS) \
+	$(man5_MANS) \
+	$(NULL)
+
+endif # ENABLE_GTK_DOC
diff --git a/Makefile.am b/Makefile.am
index cc44166a..172af0b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ include Makefile-ostree.am
 include Makefile-switchroot.am
 include Makefile-tests.am
 include Makefile-boot.am
+include Makefile-man.am
 
 release-tag:
 	git tag -m "Release $(VERSION)" v$(VERSION)
diff --git a/configure.ac b/configure.ac
index b5bc1e56..46b77fbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,7 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 ])
 
 AC_PATH_PROG([XSLTPROC], [xsltproc])
+AM_CONDITIONAL([ENABLE_XSLTPROC], test -n "${XSLTPROC}")
 
 AC_ARG_WITH(libarchive,
 	    AS_HELP_STRING([--without-libarchive], [Do not use libarchive]),
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9406f3ef..c40057e0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -126,43 +126,7 @@ version.xml:
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
-man1_MANS = ostree.1 ostree-admin-cleanup.1 ostree-admin-config-diff.1 ostree-admin-deploy.1 ostree-admin-init-fs.1 ostree-admin-instutil.1 ostree-admin-os-init.1 ostree-admin-status.1 ostree-admin-set-origin.1 ostree-admin-switch.1 ostree-admin-undeploy.1 ostree-admin-upgrade.1 ostree-admin.1 ostree-cat.1 ostree-checkout.1 ostree-checksum.1 ostree-commit.1 ostree-gpg-sign.1 ostree-config.1 ostree-diff.1 ostree-fsck.1 ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 ostree-rev-parse.1 ostree-show.1 ostree-summary.1 ostree-static-delta.1 ostree-trivial-httpd.1
-
-man5_MANS = ostree.repo.5 ostree.repo-config.5
-
-if ENABLE_GTK_DOC
-
-XSLTPROC_FLAGS = \
-        --nonet \
-        --stringparam man.output.quietly 1 \
-        --stringparam funcsynopsis.style ansi \
-        --stringparam man.th.extra1.suppress 1 \
-        --stringparam man.authors.section.enabled 0 \
-        --stringparam man.copyright.section.enabled 0
-
-XSLTPROC_MAN = \
-	$(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-
-.xml.1:
-	$(AM_V_GEN) $(XSLTPROC_MAN) $<
-.xml.5:
-	$(AM_V_GEN) $(XSLTPROC_MAN) $<
-
-CLEANFILES += \
-	$(man1_MANS) \
-	$(man5_MANS) \
-	$(NULL)
-
-endif # ENABLE_GTK_DOC
-
-MAN_IN_FILES = \
-	$(man1_MANS:.1=.xml) \
-	$(man5_MANS:.5=.xml) \
-	$(NULL)
-
 EXTRA_DIST += \
-	$(MAN_IN_FILES) \
 	version.xml \
-	ostree.xml \
 	ostree-sections.txt \
 	$(NULL)
diff --git a/doc/ostree-admin-cleanup.xml b/man/ostree-admin-cleanup.xml
index e91e1c46..e91e1c46 100644
--- a/doc/ostree-admin-cleanup.xml
+++ b/man/ostree-admin-cleanup.xml
diff --git a/doc/ostree-admin-config-diff.xml b/man/ostree-admin-config-diff.xml
index 69209e49..69209e49 100644
--- a/doc/ostree-admin-config-diff.xml
+++ b/man/ostree-admin-config-diff.xml
diff --git a/doc/ostree-admin-deploy.xml b/man/ostree-admin-deploy.xml
index ef96203c..ef96203c 100644
--- a/doc/ostree-admin-deploy.xml
+++ b/man/ostree-admin-deploy.xml
diff --git a/doc/ostree-admin-init-fs.xml b/man/ostree-admin-init-fs.xml
index 034eafb4..034eafb4 100644
--- a/doc/ostree-admin-init-fs.xml
+++ b/man/ostree-admin-init-fs.xml
diff --git a/doc/ostree-admin-instutil.xml b/man/ostree-admin-instutil.xml
index 94894c10..94894c10 100644
--- a/doc/ostree-admin-instutil.xml
+++ b/man/ostree-admin-instutil.xml
diff --git a/doc/ostree-admin-os-init.xml b/man/ostree-admin-os-init.xml
index 77bd126a..77bd126a 100644
--- a/doc/ostree-admin-os-init.xml
+++ b/man/ostree-admin-os-init.xml
diff --git a/doc/ostree-admin-set-origin.xml b/man/ostree-admin-set-origin.xml
index 86984da6..86984da6 100644
--- a/doc/ostree-admin-set-origin.xml
+++ b/man/ostree-admin-set-origin.xml
diff --git a/doc/ostree-admin-status.xml b/man/ostree-admin-status.xml
index 0ffd4c5b..0ffd4c5b 100644
--- a/doc/ostree-admin-status.xml
+++ b/man/ostree-admin-status.xml
diff --git a/doc/ostree-admin-switch.xml b/man/ostree-admin-switch.xml
index 8072d6b9..8072d6b9 100644
--- a/doc/ostree-admin-switch.xml
+++ b/man/ostree-admin-switch.xml
diff --git a/doc/ostree-admin-undeploy.xml b/man/ostree-admin-undeploy.xml
index 155c5ec8..155c5ec8 100644
--- a/doc/ostree-admin-undeploy.xml
+++ b/man/ostree-admin-undeploy.xml
diff --git a/doc/ostree-admin-upgrade.xml b/man/ostree-admin-upgrade.xml
index ddd33dc6..ddd33dc6 100644
--- a/doc/ostree-admin-upgrade.xml
+++ b/man/ostree-admin-upgrade.xml
diff --git a/doc/ostree-admin.xml b/man/ostree-admin.xml
index 62cbbe93..62cbbe93 100644
--- a/doc/ostree-admin.xml
+++ b/man/ostree-admin.xml
diff --git a/doc/ostree-cat.xml b/man/ostree-cat.xml
index 425ac26a..425ac26a 100644
--- a/doc/ostree-cat.xml
+++ b/man/ostree-cat.xml
diff --git a/doc/ostree-checkout.xml b/man/ostree-checkout.xml
index 67d6469e..67d6469e 100644
--- a/doc/ostree-checkout.xml
+++ b/man/ostree-checkout.xml
diff --git a/doc/ostree-checksum.xml b/man/ostree-checksum.xml
index 53914782..53914782 100644
--- a/doc/ostree-checksum.xml
+++ b/man/ostree-checksum.xml
diff --git a/doc/ostree-commit.xml b/man/ostree-commit.xml
index 4a86c1d2..4a86c1d2 100644
--- a/doc/ostree-commit.xml
+++ b/man/ostree-commit.xml
diff --git a/doc/ostree-config.xml b/man/ostree-config.xml
index 715bebbc..715bebbc 100644
--- a/doc/ostree-config.xml
+++ b/man/ostree-config.xml
diff --git a/doc/ostree-diff.xml b/man/ostree-diff.xml
index aaa76b13..aaa76b13 100644
--- a/doc/ostree-diff.xml
+++ b/man/ostree-diff.xml
diff --git a/doc/ostree-fsck.xml b/man/ostree-fsck.xml
index 2cae92cf..2cae92cf 100644
--- a/doc/ostree-fsck.xml
+++ b/man/ostree-fsck.xml
diff --git a/doc/ostree-gpg-sign.xml b/man/ostree-gpg-sign.xml
index 44ddb655..44ddb655 100644
--- a/doc/ostree-gpg-sign.xml
+++ b/man/ostree-gpg-sign.xml
diff --git a/doc/ostree-init.xml b/man/ostree-init.xml
index 4518e244..4518e244 100644
--- a/doc/ostree-init.xml
+++ b/man/ostree-init.xml
diff --git a/doc/ostree-log.xml b/man/ostree-log.xml
index 4c23b0d5..4c23b0d5 100644
--- a/doc/ostree-log.xml
+++ b/man/ostree-log.xml
diff --git a/doc/ostree-ls.xml b/man/ostree-ls.xml
index 9378759b..9378759b 100644
--- a/doc/ostree-ls.xml
+++ b/man/ostree-ls.xml
diff --git a/doc/ostree-prune.xml b/man/ostree-prune.xml
index 9e8cc873..9e8cc873 100644
--- a/doc/ostree-prune.xml
+++ b/man/ostree-prune.xml
diff --git a/doc/ostree-pull-local.xml b/man/ostree-pull-local.xml
index 2ecd12c1..2ecd12c1 100644
--- a/doc/ostree-pull-local.xml
+++ b/man/ostree-pull-local.xml
diff --git a/doc/ostree-pull.xml b/man/ostree-pull.xml
index d915bcd2..d915bcd2 100644
--- a/doc/ostree-pull.xml
+++ b/man/ostree-pull.xml
diff --git a/doc/ostree-refs.xml b/man/ostree-refs.xml
index e97cb1c5..e97cb1c5 100644
--- a/doc/ostree-refs.xml
+++ b/man/ostree-refs.xml
diff --git a/doc/ostree-remote.xml b/man/ostree-remote.xml
index c303014e..c303014e 100644
--- a/doc/ostree-remote.xml
+++ b/man/ostree-remote.xml
diff --git a/doc/ostree-reset.xml b/man/ostree-reset.xml
index 6d80ccd9..6d80ccd9 100644
--- a/doc/ostree-reset.xml
+++ b/man/ostree-reset.xml
diff --git a/doc/ostree-rev-parse.xml b/man/ostree-rev-parse.xml
index c8c02629..c8c02629 100644
--- a/doc/ostree-rev-parse.xml
+++ b/man/ostree-rev-parse.xml
diff --git a/doc/ostree-show.xml b/man/ostree-show.xml
index f449b51f..f449b51f 100644
--- a/doc/ostree-show.xml
+++ b/man/ostree-show.xml
diff --git a/doc/ostree-static-delta.xml b/man/ostree-static-delta.xml
index d410a2d6..d410a2d6 100644
--- a/doc/ostree-static-delta.xml
+++ b/man/ostree-static-delta.xml
diff --git a/doc/ostree-summary.xml b/man/ostree-summary.xml
index 3fa287eb..3fa287eb 100644
--- a/doc/ostree-summary.xml
+++ b/man/ostree-summary.xml
diff --git a/doc/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
index 2b846858..2b846858 100644
--- a/doc/ostree-trivial-httpd.xml
+++ b/man/ostree-trivial-httpd.xml
diff --git a/doc/ostree.repo-config.xml b/man/ostree.repo-config.xml
index c77ccc6e..c77ccc6e 100644
--- a/doc/ostree.repo-config.xml
+++ b/man/ostree.repo-config.xml
diff --git a/doc/ostree.repo.xml b/man/ostree.repo.xml
index b8ad4052..b8ad4052 100644
--- a/doc/ostree.repo.xml
+++ b/man/ostree.repo.xml
diff --git a/doc/ostree.xml b/man/ostree.xml
index 161ef0bc..161ef0bc 100644
--- a/doc/ostree.xml
+++ b/man/ostree.xml