Merge branch 'asciidoc' into working

We're getting close to release, so might as well do this now so people can
actually update some of our documentation.

1 files changed, 42 insertions, 7 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 14caa0da..ad251287 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,25 +1,60 @@
-man_MANS = \
+ASCIIDOC_MANS = \
 	pacman.8 \
 	makepkg.8 \
+	repo-add.8 \
 	PKGBUILD.5 \
 	makepkg.conf.5 \
 	pacman.conf.5 \
 	libalpm.3
 
-if HAS_DOXYGEN
-man_MANS += $(wildcard man3/*.3)
+if USE_DOXYGEN
+DOXYGEN_MANS = $(wildcard man3/*.3)
 endif
 
-EXTRA_DIST = $(man_MANS) Doxyfile
+man_MANS = $(ASCIIDOC_MANS) $(DOXYGEN_MANS)
 
-if HAS_DOXYGEN
+EXTRA_DIST = \
+	pacman.8.txt \
+	makepkg.8.txt \
+	repo-add.8.txt \
+	PKGBUILD.5.txt \
+	PKGBUILD-example.txt \
+	makepkg.conf.5.txt \
+	pacman.conf.5.txt \
+	libalpm.3.txt \
+	footer.txt \
+	Doxyfile \
+	$(ASCIIDOC_MANS)
+
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(DOXYGEN_MANS) *.xml
+
+if USE_DOXYGEN
 all: doxygen.in
 
 doxygen.in:
 	doxygen $(srcdir)/Doxyfile
 endif
 
-clean-local:
-	$(RM) man3/*.3
+if USE_ASCIIDOC
+ASCIIDOC_OPTS = \
+	-f asciidoc.conf \
+	-a pacman_version="$(PACKAGE_VERSION)" \
+	-a pacman_date="`date +%Y-%m-%d`" \
+	-a sysconfdir=$(sysconfdir)
+
+$(ASCIIDOC_MANS):
+	a2x -d manpage -f manpage --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
+
+# These rules are due to the includes and files of the asciidoc text
+$(ASCIIDOC_MANS): footer.txt
+pacman.8: pacman.8.txt
+makepkg.8: makepkg.8.txt
+repo-add.8: repo-add.8.txt
+PKGBUILD.5: PKGBUILD.5.txt PKGBUILD-example.txt
+makepkg.conf.5: makepkg.conf.5.txt
+pacman.conf.5: pacman.conf.5.txt
+libalpm.3: libalpm.3.txt
+endif
 
 # vim:set ts=2 sw=2 noet: