bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #63 from rofl0r/fix_manpage_gen

Browse Source 
ship manpages as part of the dist tarball
This commit is contained in:
Michael Adam 2016-12-20 22:27:11 +01:00 committed by GitHub
commit 90df510932
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -248,9 +248,6 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
# Check for asciidoc # Check for asciidoc
AC_PATH_PROG(A2X, a2x, no) AC_PATH_PROG(A2X, a2x, no)
AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") 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([ AC_CONFIG_FILES([
Makefile Makefile
@ -269,3 +266,20 @@ tests/scripts/Makefile
]) ])
AC_OUTPUT 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

3
docs/man5/Makefile.am
View File

@ -18,3 +18,6 @@ endif
CLEANFILES = \ CLEANFILES = \
$(MAN5_FILES:.txt=.5) \ $(MAN5_FILES:.txt=.5) \
$(MAN5_FILES:.txt=.xml) $(MAN5_FILES:.txt=.xml)
EXTRA_DIST = \
$(MAN5_FILES:.txt=.5)

3
docs/man8/Makefile.am
View File

@ -18,3 +18,6 @@ endif
CLEANFILES = \ CLEANFILES = \
$(MAN8_FILES:.txt=.8) \ $(MAN8_FILES:.txt=.8) \
$(MAN8_FILES:.txt=.xml) $(MAN8_FILES:.txt=.xml)
EXTRA_DIST= \
$(MAN8_FILES:.txt=.8)