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>

Distribute manpages in source tarball
5c320b76 · Guido Trotter · Daniel Lezcano · f8e88c4e · 5c320b76 · 5c320b76
Commit 5c320b76 authored Jul 26, 2009 by Guido Trotter Committed by Daniel Lezcano Jul 26, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

configure.ac configure.ac +2 -2

Makefile.am doc/Makefile.am +4 -2

No files found.
--- 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'.

 ])


--- a/doc/Makefile.am
+++ b/doc/Makefile.am

-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