[libvirt] [PATCH 2/2] build-sys: distribute the man pages in the tarball

[Eric Blake]

On 08/05/2010 07:17 PM, Diego Elio Pettenò wrote:
> This slightly reduces the requirements for building libvirt.
> ---
>  daemon/Makefile.am |    4 ++--
>  tools/Makefile.am  |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index dbf0ac3..74ad67b 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -45,7 +45,7 @@ BUILT_SOURCES =
>  
>  if WITH_LIBVIRTD
>  
> -man_MANS = libvirtd.8
> +dist_man_MANS = libvirtd.8

This says that libvirtd.8 is distributed as part of the tarball, rather
than omitted, even though we have rules to regenerate it.  I agree that
distributing it makes it easier to build from a tarball if you don't
have tools to regenerate it, so ACK to this part.  However,

>  
>  sbin_PROGRAMS = libvirtd
>  
> @@ -324,5 +324,5 @@ uninstall-data-sasl:
>  endif
>  
>  
> -CLEANFILES = $(BUILT_SOURCES) $(man_MANS) libvirtd.pod
> +CLEANFILES = $(BUILT_SOURCES) $(dist_man_MANS) libvirtd.pod

This says to nuke the distributed man page.  Which means 'make && make
clean && make' is once again requiring those extra tools.

The patch needs to move distributed man pages out of CLEANFILES and into
MAINTAINERCLEANFILES.  Since only the maintainer is required to have the
tools for regenerating the man pages (think 'make dist'), only the
maintainer-clean target should nuke existing pages.

I'm also wondering if we need a hook in 'make dist' to ensure the man
pages are up-to-date (now that the developers don't rebuild it from a
fresh tarball, the maintainer should now make sure that a stale copy
from incremental builds does not sneak into the tarball).

Do you want to make those edits and resubmit, or do you need me to make
the tweaks?

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20100806/d3ab0185/attachment-0001.sig>