diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-23 10:04:38 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-01-24 07:32:41 -0500 |
| commit | c183e15263787af913bf8eb7be707e0f2e974824 (patch) | |
| tree | c71413c1a220cd6573d66c6bf2c49d5799b1137a | |
| parent | c94494c144c634b7fa3187c55458cafa0e06a69c (diff) | |
man: allow installing prebuilt man pages from tarball
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.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | 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 |