On Wed, Sep 26, 2012 at 04:41:50PM +0200, David Herrmann wrote: > We really shouldn't add the man-pages when HAVE_XSLTPROC is not true so > move it into the if-clause. > But declare the automake-variables outside of the if-clause to avoid > automake complaints.
Thanks, committed. Kristian > Signed-off-by: David Herrmann <[email protected]> > --- > doc/man/Makefile.am | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am > index 7d00b06..a6a5072 100644 > --- a/doc/man/Makefile.am > +++ b/doc/man/Makefile.am > @@ -9,16 +9,18 @@ MANPAGES = \ > MANPAGES_ALIASES = \ > wl_display_connect_to_fd.3 > > -wl_display_connect_to_fd.3: wl_display_connect.3 > - > XML_FILES = \ > ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst > %.5,%.xml,${patsubst %.7,%.xml,$(MANPAGES)}}}} > -CLEANFILES = $(MANPAGES) $(MANPAGES_ALIASES) > -EXTRA_DIST = $(MANPAGES) $(MANPAGES_ALIASES) $(XML_FILES) > -man_MANS = $(MANPAGES) $(MANPAGES_ALIASES) > +CLEANFILES = > +EXTRA_DIST = > +man_MANS = > > if HAVE_XSLTPROC > > +CLEANFILES += $(MANPAGES) $(MANPAGES_ALIASES) > +EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES) $(XML_FILES) > +man_MANS += $(MANPAGES) $(MANPAGES_ALIASES) > + > XSLTPROC_FLAGS = \ > --stringparam man.authors.section.enabled 0 \ > --stringparam man.copyright.section.enabled 0 \ > @@ -42,4 +44,6 @@ XSLTPROC_PROCESS_MAN = \ > %.7: %.xml > $(XSLTPROC_PROCESS_MAN) > > +wl_display_connect_to_fd.3: wl_display_connect.3 > + > endif # HAVE_XSLTPROC > -- > 1.7.12.1 > _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
