[PATCH libXcomposite 2/2] man: allow installing prebuilt man pages from tarball

[Dan Nicholson]

On Sun, Jan 24, 2010 at 5:14 AM, Gaetan Nadon <memsize at videotron.ca> wrote:
> The man pages source may be supplied in the tarball or built
> from git. The makefile needs to take that into consideration
> and adjust the targets accordingly.
>
> This prevents the regular make target to fail when the source
> is not available and the xmlto is not available.
>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  configure.ac    |    5 +++++
>  man/Makefile.am |    2 ++
>  2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 54ea754..f5aced9 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -49,6 +49,11 @@ AC_PROG_LIBTOOL
>  XORG_DEFAULT_OPTIONS
>  XORG_WITH_XMLTO
>
> +# Determine if the source for man pages is available
> +# It may already be present (tarball) or can be generated using xmlto
> +AM_CONDITIONAL([INSTALL_MANPAGES],
> +       [test -f "$srcdir/man/Xcomposite.man" || test "x$have_xmlto" = xyes])
> +
>  # Check compositeext configuration, strip extra digits from package version to
>  # find the required protocol version
>
> diff --git a/man/Makefile.am b/man/Makefile.am
> index 13a75c5..54eb624 100644
> --- a/man/Makefile.am
> +++ b/man/Makefile.am
> @@ -21,8 +21,10 @@ Xcomposite_man_aliases =                     \
>
>  Xcomposite_shadowmen = $(Xcomposite_man_aliases:=. at LIB_MAN_SUFFIX@)
>
> +if INSTALL_MANPAGES
>  libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
>              $(Xcomposite_shadowmen)
> +endif
>
>  EXTRA_DIST  = $(libman_PRE) $(libman_xml)
>
> --
> 1.6.0.4

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>