[patch] Always DIST man page xml files

Quentin Glidic sardemff7+wayland at sardemff7.net
Tue Feb 5 02:23:58 PST 2013


On 04/02/2013 13:07, Armin K. wrote:
> diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
> index 1407953..4eb0ddc 100644
> --- a/doc/man/Makefile.am
> +++ b/doc/man/Makefile.am
> @@ -12,14 +12,14 @@ MANPAGES_ALIASES = \
>  XML_FILES = \
>      ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst
> %.5,%.xml,${patsubst %.7,%.xml,$(MANPAGES)}}}}
>  CLEANFILES =
> -EXTRA_DIST =
> +EXTRA_DIST = $(XML_FILES)
>  man_MANS =
> 
>  if HAVE_XSLTPROC
>  if HAVE_MANPAGES_STYLESHEET
> 
>  CLEANFILES += $(MANPAGES) $(MANPAGES_ALIASES)
> -EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES) $(XML_FILES)
> +EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES)
>  man_MANS += $(MANPAGES) $(MANPAGES_ALIASES)
> 
>  XSLTPROC_FLAGS = \

You should use dist_man_MANS too, and drop the "EXTRA_DIST +=
$(MANPAGES) $(MANPAGES_ALIASES)" line entirely.

Also, should the man pages be disted? If so, dist_man_MANS should simply
be outside the conditional, so make dist and make distcheck
will fail if you didn’t generate the man pages, since they are expected
to exist (dist_) and there are no rules to create them.

I think there is nothing configure-time dependent in the existing man
pages, but if we add new pages that needs e.g. paths from configure,
they would need to be undisted, making xsltproc a build-time hard
dependency.

-- 

Quentin “Sardem FF7” Glidic


More information about the wayland-devel mailing list