Attachment #232721 for bug #262773





SPHINXBUILDDIR = $(builddir)/_build

LF = ${.newline}
RNDC_CONF = .. |rndc_conf| replace:: ``$(sysconfdir)/rndc.conf``
RNDC_KEY = .. |rndc_key| replace:: ``$(sysconfdir)/rndc.key``
NAMED_CONF = .. |named_conf| replace:: ``$(sysconfdir)/named.conf``

NAMED_PID = .. |named_pid| replace:: ``$(runstatedir)/named.pid``
SESSION_KEY = .. |session_key| replace:: ``$(runstatedir)/session.key``

RST_EPILOG = "$(RNDC_CONF)$(LF)$(RNDC_KEY)$(LF)$(NAMED_CONF)$(LF)$(BIND_KEYS)$(LF)$(NAMED_PID)$(LF)$(SESSION_KEY)"

common_SPHINXOPTS =			\
	-W				\

ALLSPHINXOPTS =					\
	$(common_SPHINXOPTS)			\
	-D today="$(RELEASE_DATE)"		\
	-D rst_epilog="${RST_EPILOG}"	\
	$(SPHINXOPTS)				\
	$(srcdir)


man_NAMED_PID = .. |named_pid| replace:: ``$(_)runstatedir$(_)/named.pid``
man_SESSION_KEY = .. |session_key| replace:: ``$(_)runstatedir$(_)/session.key``

man_RST_EPILOG = $(man_RNDC_CONF)$(LF)$(man_RNDC_KEY)$(LF)$(man_NAMED_CONF)$(LF)$(man_BIND_KEYS)$(LF)$(man_NAMED_PID)$(LF)$(man_SESSION_KEY)

man_SPHINXOPTS =				\
	$(common_SPHINXOPTS)			\
	-D version="@""PACKAGE_VERSION@"	\
	-D today="@""RELEASE_DATE@"		\
	-D release="@""PACKAGE_VERSION@"	\
	-D rst_epilog="${man_RST_EPILOG}"	\
	$(SPHINXOPTS)				\
	$(srcdir)


Return to bug 262773

Lines 9-15 AM_V_SPHINX_0 = @echo " SPHINX $@"; Link Here

(-)Makefile.docs (-5 / +5 lines)
9		9
10	SPHINXBUILDDIR = $(builddir)/_build	10	SPHINXBUILDDIR = $(builddir)/_build
11		11
12	LF = \n	12	LF = ${.newline}
13	RNDC_CONF = .. \|rndc_conf\| replace:: ``$(sysconfdir)/rndc.conf``	13	RNDC_CONF = .. \|rndc_conf\| replace:: ``$(sysconfdir)/rndc.conf``
14	RNDC_KEY = .. \|rndc_key\| replace:: ``$(sysconfdir)/rndc.key``	14	RNDC_KEY = .. \|rndc_key\| replace:: ``$(sysconfdir)/rndc.key``
15	NAMED_CONF = .. \|named_conf\| replace:: ``$(sysconfdir)/named.conf``	15	NAMED_CONF = .. \|named_conf\| replace:: ``$(sysconfdir)/named.conf``
Lines 17-23 BIND_KEYS = .. \|bind_keys\| replace:: ``$(sysconfdir)/bind.keys`` Link Here
17	NAMED_PID = .. \|named_pid\| replace:: ``$(runstatedir)/named.pid``	17	NAMED_PID = .. \|named_pid\| replace:: ``$(runstatedir)/named.pid``
18	SESSION_KEY = .. \|session_key\| replace:: ``$(runstatedir)/session.key``	18	SESSION_KEY = .. \|session_key\| replace:: ``$(runstatedir)/session.key``
19		19
20	export RST_EPILOG = $(RNDC_CONF)$(LF)$(RNDC_KEY)$(LF)$(NAMED_CONF)$(LF)$(BIND_KEYS)$(LF)$(NAMED_PID)$(LF)$(SESSION_KEY)	20	RST_EPILOG = "$(RNDC_CONF)$(LF)$(RNDC_KEY)$(LF)$(NAMED_CONF)$(LF)$(BIND_KEYS)$(LF)$(NAMED_PID)$(LF)$(SESSION_KEY)"
21		21
22	common_SPHINXOPTS = \	22	common_SPHINXOPTS = \
23	-W \	23	-W \
Lines 30-36 common_SPHINXOPTS = \ Link Here
30	ALLSPHINXOPTS = \	30	ALLSPHINXOPTS = \
31	$(common_SPHINXOPTS) \	31	$(common_SPHINXOPTS) \
32	-D today="$(RELEASE_DATE)" \	32	-D today="$(RELEASE_DATE)" \
33	-D rst_epilog="$$(printf "$${RST_EPILOG}")" \	33	-D rst_epilog="${RST_EPILOG}" \
34	$(SPHINXOPTS) \	34	$(SPHINXOPTS) \
35	$(srcdir)	35	$(srcdir)
36		36
Lines 42-55 man_BIND_KEYS = .. \|bind_keys\| replace:: ``$(_)sysconfdir$(_)/bind.keys`` Link Here
42	man_NAMED_PID = .. \|named_pid\| replace:: ``$(_)runstatedir$(_)/named.pid``	42	man_NAMED_PID = .. \|named_pid\| replace:: ``$(_)runstatedir$(_)/named.pid``
43	man_SESSION_KEY = .. \|session_key\| replace:: ``$(_)runstatedir$(_)/session.key``	43	man_SESSION_KEY = .. \|session_key\| replace:: ``$(_)runstatedir$(_)/session.key``
44		44
45	export man_RST_EPILOG = $(man_RNDC_CONF)$(LF)$(man_RNDC_KEY)$(LF)$(man_NAMED_CONF)$(LF)$(man_BIND_KEYS)$(LF)$(man_NAMED_PID)$(LF)$(man_SESSION_KEY)	45	man_RST_EPILOG = $(man_RNDC_CONF)$(LF)$(man_RNDC_KEY)$(LF)$(man_NAMED_CONF)$(LF)$(man_BIND_KEYS)$(LF)$(man_NAMED_PID)$(LF)$(man_SESSION_KEY)
46		46
47	man_SPHINXOPTS = \	47	man_SPHINXOPTS = \
48	$(common_SPHINXOPTS) \	48	$(common_SPHINXOPTS) \
49	-D version="@""PACKAGE_VERSION@" \	49	-D version="@""PACKAGE_VERSION@" \
50	-D today="@""RELEASE_DATE@" \	50	-D today="@""RELEASE_DATE@" \
51	-D release="@""PACKAGE_VERSION@" \	51	-D release="@""PACKAGE_VERSION@" \
52	-D rst_epilog="$$(printf "$${man_RST_EPILOG}")" \	52	-D rst_epilog="${man_RST_EPILOG}" \
53	$(SPHINXOPTS) \	53	$(SPHINXOPTS) \
54	$(srcdir)	54	$(srcdir)
55		55