diff options
| author | rofl0r <retnyg@gmx.net> | 2016-12-20 20:07:23 +0000 |
|---|---|---|
| committer | rofl0r <retnyg@gmx.net> | 2016-12-20 21:06:20 +0000 |
| commit | 909528e29c57fe8050a2f9160410e5e72b2f099b (patch) | |
| tree | b84efb0319693cb238db93ca4769b96a00b31102 | |
| parent | 4e0951afd91c4b342d9fc35382c9e9ab203ebfca (diff) | |
ship manpages as part of the dist tarball
`make dist` now creates the manpages and puts them into the tarball, so
the user does not need to have `a2x` installed to build them.
closes #2
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | docs/man5/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/man8/Makefile.am | 3 |
3 files changed, 23 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b4dee00..fe19787 100644 --- a/configure.ac +++ b/configure.ac @@ -248,9 +248,6 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") # Check for asciidoc AC_PATH_PROG(A2X, a2x, no) AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") -if test x"$A2X" = x"no"; then - AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) -fi AC_CONFIG_FILES([ Makefile @@ -269,3 +266,20 @@ tests/scripts/Makefile ]) AC_OUTPUT + +# the manpages are shipped in the release tarball and we don't want them to +# get regenerated if a2x is not available. the intermediate files from +# AC_CONFIG_FILES are created with config.status, which is created at configure +# runtime, so we need to touch them after config.status terminated to prevent +# make from rebuild them. + +if test "x$A2X" = "xno"; then + touch docs/man5/tinyproxy.conf.txt + touch docs/man8/tinyproxy.txt + if test -e docs/man5/tinyproxy.conf.5 ; then + touch docs/man5/tinyproxy.conf.5 + fi + if test -e docs/man8/tinyproxy.8 ; then + touch docs/man8/tinyproxy.8 + fi +fi diff --git a/docs/man5/Makefile.am b/docs/man5/Makefile.am index 8143932..b2a9dd3 100644 --- a/docs/man5/Makefile.am +++ b/docs/man5/Makefile.am @@ -18,3 +18,6 @@ endif CLEANFILES = \ $(MAN5_FILES:.txt=.5) \ $(MAN5_FILES:.txt=.xml) + +EXTRA_DIST = \ + $(MAN5_FILES:.txt=.5) diff --git a/docs/man8/Makefile.am b/docs/man8/Makefile.am index 930dcf6..9bc4955 100644 --- a/docs/man8/Makefile.am +++ b/docs/man8/Makefile.am @@ -18,3 +18,6 @@ endif CLEANFILES = \ $(MAN8_FILES:.txt=.8) \ $(MAN8_FILES:.txt=.xml) + +EXTRA_DIST= \ + $(MAN8_FILES:.txt=.8) |