Distribute manpages in source tarball

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@quaqua.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/configure.ac b/configure.ac
index 0860d5fe127283121f6a4a80e3cd1129419a50a0..93dc3273c1692ba3fd3ccb0fe90be6bf6b5cb5e7 100644 (file)
--- 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 1bd7f9f882f1fac6121c7e3260d61976d3a4da34..9f7bf695e89cc19ff4e405871a43716cef85e595 100644 (file)
--- 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