diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-23 10:04:38 -0500 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-08-02 09:53:31 +1000 |
| commit | 4e42d40e282e0977d8df882c49e1602740d3d79f (patch) | |
| tree | 0149d11ac7aaa5f1c2073c1e9400294996d7e577 | |
| parent | 08775f43d3dc288ff2ce5eda5adad24ee2ccad84 (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>
(cherry picked from commit c183e15263787af913bf8eb7be707e0f2e974824)
| -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 ede6363..37cda23 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,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) AC_ARG_VAR([XMLTO], [Path to xmlto command]) diff --git a/man/Makefile.am b/man/Makefile.am index 221b677..8ea88e8 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -114,7 +114,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 |