Ensure that manpages are always distributed and installed

Commit 012f7939784358b02726c169543aa99436439335 was a bit misguided in its
thinking, and resulted in a package built without asciidoc enabled not
installing the manpages to the system on a 'make install' operation. Fix
this behavior by making manpages required in a normal build, and in order to
disable their existence, the '--disable-doc' option must be used.

Hopefully this solves manpage issues for both developers and package
builders while allowing as much flexibility as possible.

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 28 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index e07321b3..307a7d68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc po pactest contrib
+SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib
+if WANT_DOC
+SUBDIRS += doc
+endif
 
 # Some files automatically included, so they aren't specified below:
 #   AUTHORS, COPYING, NEWS, README
diff --git a/configure.ac b/configure.ac
index bed26cfd..64715959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,11 @@ AC_ARG_WITH(db-ext,
 	AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
 	[DBEXT=$withval], [DBEXT=.db.tar.gz])
 
+# Help line for documentation
+AC_ARG_ENABLE(doc,
+	AC_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]),
+	[wantdoc=$enableval], [wantdoc=yes])
+
 # Help line for doxygen
 AC_ARG_ENABLE(doxygen,
 	AC_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]),
@@ -218,6 +223,17 @@ AC_SUBST(CARCH)
 AC_SUBST(CARCHFLAGS)
 AC_SUBST(CHOST)
 
+# Check for documentation support and status
+AC_MSG_CHECKING([for building documentation])
+if test "x$wantdoc" = "xyes" ; then
+	AC_MSG_RESULT([yes])
+	wantdoc=yes
+else
+	AC_MSG_RESULT([no, disabled by configure])
+	wantdoc=no
+fi
+AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes")
+
 # Check for doxygen support and status
 AC_MSG_CHECKING([for doxygen])
 if test "x$wantdoxygen" = "xyes" ; then
@@ -336,6 +352,7 @@ pacman_display_version:
     database extension     : ${DBEXT}
 
   Compilation options:
+    Run make in doc/ dir   : ${wantdoc}
     Doxygen support        : ${usedoxygen}
     Asciidoc support       : ${useasciidoc}
     debug support          : ${debug}
diff --git a/doc/Makefile.am b/doc/Makefile.am
index abc761b8..3e469294 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,15 +14,6 @@ ASCIIDOC_MANS = \
 
 DOXYGEN_MANS = $(wildcard man3/*.3)
 
-man_MANS =
-
-if USE_ASCIIDOC
-man_MANS += $(ASCIIDOC_MANS)
-endif
-if USE_DOXYGEN
-man_MANS += $(DOXYGEN_MANS)
-endif
-
 EXTRA_DIST = \
 	pacman.8.txt \
 	makepkg.8.txt \
@@ -38,9 +29,15 @@ EXTRA_DIST = \
 	$(DOXYGEN_MANS)
 
 # Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = $(DOXYGEN_MANS) *.xml
+MOSTLYCLEANFILES = *.xml
+MAINTAINERCLEANFILES = $(ASCIIDOC_MANS)
+
+man_MANS =
+dist_man_MANS = $(ASCIIDOC_MANS)
 
 if USE_DOXYGEN
+man_MANS += $(DOXYGEN_MANS)
+
 all: doxygen.in
 
 doxygen.in: