From: Guido Trotter Date: Sun, 26 Jul 2009 15:44:11 +0000 (+0200) Subject: Distribute manpages in source tarball X-Git-Tag: lxc_0_6_4~101 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c320b769229d713e84b02ed6b7ae1309ac31dbb;p=thirdparty%2Flxc.git 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 Signed-off-by: Daniel Lezcano --- diff --git a/configure.ac b/configure.ac index 0860d5fe1..93dc3273c 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 1bd7f9f88..9f7bf695e 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