Commit 39cbe09e authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'get-release-date-from-NEWS' into 'master'

parents 5b0aebf3 0e82ab7b
......@@ -28,8 +28,6 @@
/samples/knot.sample.conf
/doc/Makefile
/doc/Makefile.in
/man/Makefile
/man/Makefile.in
/aclocal.m4
/ar-lib
/autoscan.log
......@@ -92,3 +90,14 @@
*.gcno
/coverage.info
/coverage.html
# sphinx-build manpages
/doc/man/kdig.1
/doc/man/keymgr.8
/doc/man/khost.1
/doc/man/knot.conf.5
/doc/man/knot1to2.1
/doc/man/knotc.8
/doc/man/knotd.8
/doc/man/knsec3hash.1
/doc/man/knsupdate.1
......@@ -12,9 +12,7 @@ AC_CANONICAL_HOST
AX_SET_VERSION_INFO
# Automatically update release date based on configure.ac date
AS_CASE([$host_os],
[linux*],[release_date=`date +"%Y-%m-%d" -r ${srcdir}/configure.ac`],
[*],[release_date=$(date -r "$(stat -f %m ${srcdir}/configure.ac)" +"%Y-%m-%d")])
release_date=$(sed -n 's/^Knot DNS .* (\(.*\))/\1/p;q;' ${srcdir}/NEWS)
AC_SUBST([RELEASE_DATE], $release_date)
# Set compiler compatibility flags
......
MANPAGES_IN = man/knot.conf.5in man/knotc.8in man/knotd.8in man/kdig.1in man/khost.1in man/knsupdate.1in man/knot1to2.1in man/knsec3hash.1in man/keymgr.8in
MANPAGES_RST = reference.rst man_knotc.rst man_knotd.rst man_kdig.rst man_khost.rst man_knsupdate.rst man_knot1to2.rst man_knsec3hash.rst man_keymgr.rst
EXTRA_DIST = \
conf.py \
\
......@@ -12,37 +15,48 @@ EXTRA_DIST = \
troubleshooting.rst \
utilities.rst \
\
man_kdig.rst \
man_keymgr.rst \
man_khost.rst \
man_knot1to2.rst \
man_knotc.rst \
man_knotd.rst \
man_knsec3hash.rst \
man_knsupdate.rst \
$(MANPAGES_IN) \
$(MANPAGES_RST)
\
logo.eps \
logo.png
SPHINXBUILDDIR = $(builddir)/_build
ALLSPHINXOPTS = -c $(srcdir) -n -D latex_paper_size=a4 -D version="@VERSION@" -D today="@RELEASE_DATE@" -D release="@VERSION@" $(SPHINXOPTS) $(srcdir)
ALLSPHINXOPTS = -c $(srcdir) -n -D latex_paper_size=a4 -D version="@""VERSION@" -D today="@""RELEASE_DATE@" -D release="@""VERSION@" $(SPHINXOPTS) $(srcdir)
.PHONY: html-local singlehtml pdf-local info-local man install-html-local install-singlehtml install-pdf-local install-info-local
MANPAGES =
MANPAGES_IN =
man_MANS =
if HAVE_DAEMON
MANPAGES += man/knot.conf.5 man/knotc.8 man/knotd.8
MANPAGES_IN += reference.rst man_knotc.rst man_knotd.rst
man_MANS += man/knot.conf.5 man/knotc.8 man/knotd.8
endif # HAVE_DAEMON
if HAVE_UTILS
MANPAGES += man/kdig.1 man/khost.1 man/knsupdate.1 man/knot1to2.1 man/knsec3hash.1 man/keymgr.8
MANPAGES_IN += man_kdig.rst man_khost.rst man_knsupdate.rst man_knot1to2.rst man_knsec3hash.rst man_keymgr.rst
man_MANS += man/kdig.1 man/khost.1 man/knsupdate.1 man/knot1to2.1 man/knsec3hash.1 man/keymgr.8
endif # HAVE_UTILS
dist_man_MANS = $(MANPAGES)
man/knot.conf.5: man/knot.conf.5in
man/knotc.8: man/knotc.8in
man/knotd.8: man/knotd.8in
man/kdig.1: man/kdig.1in
man/khost.1: man/khost.1in
man/knsupdate.1: man/knsupdate.1in
man/knot1to2.1: man/knot1to2.1in
man/knsec3hash.1: man/knsec3hash.1in
man/keymgr.8: man/keymgr.8in
man_SUBST = mkdir -p man; sed -e 's,[@]VERSION@,$(VERSION),' -e 's,[@]RELEASE_DATE@,$(RELEASE_DATE),' $< > $@
.1in.1:
$(man_SUBST)
.5in.5:
$(man_SUBST)
.8in.8:
$(man_SUBST)
if HAVE_DOCS
......@@ -102,12 +116,12 @@ info-local install-info-local:
@echo "able to generate info pages."
endif
man: $(MANPAGES)
$(MANPAGES): $(MANPAGES_IN) ../configure.ac
man: $(man_MANS)
$(MANPAGES_IN): $(MANPAGES_RST)
$(SPHINXBUILD) -b man -d $(SPHINXBUILDDIR)/doctrees-man $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/man
mkdir -p man
mkdir -p $(srcdir)/man
for f in $(SPHINXBUILDDIR)/man/*; do \
sed -e '/^.TP$$/{n;s/^.B //}' "$$f" > "man/$$(basename $$f)"; \
sed -e '/^.TP$$/{n;s/^.B //}' "$$f" > "$(srcdir)/man/$$(basename $$f)in"; \
done
@echo
@echo "Build finished. The man pages are in man/."
......@@ -121,3 +135,4 @@ endif # HAVE_DOCS
clean-local:
-rm -rf $(SPHINXBUILDDIR)
-rm -f man/*.1 man/*.5 man/*.8
.\" Man page generated from reStructuredText.
.
.TH "KDIG" "1" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KDIG" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
kdig \- Advanced DNS lookup utility
.
......
.\" Man page generated from reStructuredText.
.
.TH "KEYMGR" "8" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KEYMGR" "8" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
keymgr \- DNSSEC key management utility
.
......
.\" Man page generated from reStructuredText.
.
.TH "KHOST" "1" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KHOST" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
khost \- Simple DNS lookup utility
.
......
.\" Man page generated from reStructuredText.
.
.TH "KNOT.CONF" "5" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KNOT.CONF" "5" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
knot.conf \- Knot DNS configuration file
.
......
.\" Man page generated from reStructuredText.
.
.TH "KNOT1TO2" "1" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KNOT1TO2" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
knot1to2 \- Knot DNS configuration conversion utility
.
......
.\" Man page generated from reStructuredText.
.
.TH "KNOTC" "8" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KNOTC" "8" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
knotc \- Knot DNS control utility
.
......
.\" Man page generated from reStructuredText.
.
.TH "KNOTD" "8" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KNOTD" "8" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
knotd \- Knot DNS server daemon
.
......
.\" Man page generated from reStructuredText.
.
.TH "KNSEC3HASH" "1" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KNSEC3HASH" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
knsec3hash \- Simple utility to compute NSEC3 hash
.
......
.\" Man page generated from reStructuredText.
.
.TH "KNSUPDATE" "1" "2015-04-28" "2.0.0-beta" "Knot DNS"
.TH "KNSUPDATE" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
knsupdate \- Dynamic DNS update utility
.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment