[lxc-devel] [PATCH] Distribute manpages in source tarball

[Guido Trotter]

Ship the manpages in the source tarball made by 'make dist', and clean
them up only during the 'make maintainer-clean' step. This allows
distributions not to depend on docbook at lxc build time, because the
manpages are already there.

Also update the configure warning message to sound less scary.

Signed-off-by: Guido Trotter <ultrotter at quaqua.net>
---
 configure.ac    |    4 ++--
 doc/Makefile.am |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0860d5f..93dc327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,8 +113,8 @@ if test "x$DOCBOOK" = "xno"; then
 
 Warning:
 --------
-The docbook tool is not installed, the man pages won't be generated.
-If you want the man pages, install docbook and rerun 'configure'.
+The docbook tool is not installed, the man pages won't be regenerated.
+If you need to update the manpages, install docbook and rerun 'configure'.
 
 ])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1bd7f9f..9f7bf69 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,7 @@
 
-EXTRA_DIST = FAQ.txt
+EXTRA_DIST = \
+	FAQ.txt \
+	$(man_MANS)
 
 if ENABLE_DOCBOOK
 man_MANS = \
@@ -33,6 +35,6 @@ man_MANS = \
 
 lxc-%.sgml : common_options.sgml see_also.sgml
 
-clean-local:
+maintainer-clean-local:
 	$(RM) manpage.* *.7 *.5 *.1 $(man_MANS)
 endif
-- 
1.5.6.5