[PATCH wayland] man: fix compilation without xsltproc

David Herrmann dh.herrmann at googlemail.com
Wed Sep 26 07:41:50 PDT 2012


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.

Signed-off-by: David Herrmann <dh.herrmann at googlemail.com>
---
 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



More information about the wayland-devel mailing list