diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-23 10:49:06 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-01-24 07:55:44 -0500 |
| commit | a125ac058be77d81c1806420a7fd1df3b19a6bf4 (patch) | |
| tree | 3c4462c80aef201b4e78309c750b7f425dd09a2a | |
| parent | 1b887152b514c1701e09313dde718fb9e263ff9f (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 2c898e8..375745e 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,11 @@ XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS" AC_SUBST(XTST_CFLAGS) AC_SUBST(XTST_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/XTestQueryExtension.man" || test "x$have_xmlto" = xyes]) + dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xtst]) diff --git a/man/Makefile.am b/man/Makefile.am index 67bcd3f..9d97894 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -46,7 +46,7 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) MAINTAINERCLEANFILES = $(libman_PRE) -if HAVE_XMLTO +if INSTALL_MANPAGES libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) endif |