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

Gaetan Nadon memsize at videotron.ca
Sat Jan 23 12:26:23 PST 2010


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.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac    |    5 +++++
 man/Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 347dcef..68983c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,11 @@ XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS"
 AC_SUBST(XI_CFLAGS)
 AC_SUBST(XI_LIBS)
 
+# 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/XAllowDeviceEvents.man" || test "x$have_xmlto" = xyes])
+
 # Check for xmlto and asciidoc for man page conversion
 # (only needed by people building tarballs)
 AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"])
diff --git a/man/Makefile.am b/man/Makefile.am
index dd3ed94..baa0492 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -111,7 +111,7 @@ libman_ref = \
 
 libman_pre = $(libman_txt:.txt=.man) $(libman_ref)
 
-if HAVE_DOCTOOLS
+if INSTALL_MANPAGES
 nodist_libman_DATA = $(libman_pre:.man=.$(LIB_MAN_SUFFIX))
 endif
 
-- 
1.6.0.4



More information about the xorg-devel mailing list