Attachment 232721 Details for Bug 262773 – patch to Makefile.docs

[patch] patch to Makefile.docs

bind9_make-rev0.diff (text/plain), 1.95 KB, created by Steve Wills on 2022-03-25 20:53:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2022-03-25 20:53:51 UTC

Size: 1.95 KB

patch

obsolete

>diff --git Makefile.docs Makefile.docs
>index a6bedbe225..577740bd0e 100644
>--- Makefile.docs
>+++ Makefile.docs
>@@ -9,7 +9,7 @@ AM_V_SPHINX_0 = @echo "  SPHINX   $@";
> 
> SPHINXBUILDDIR = $(builddir)/_build
> 
>-LF = \n
>+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``
>@@ -17,7 +17,7 @@ BIND_KEYS = .. |bind_keys| replace:: ``$(sysconfdir)/bind.keys``
> NAMED_PID = .. |named_pid| replace:: ``$(runstatedir)/named.pid``
> SESSION_KEY = .. |session_key| replace:: ``$(runstatedir)/session.key``
> 
>-export RST_EPILOG = $(RNDC_CONF)$(LF)$(RNDC_KEY)$(LF)$(NAMED_CONF)$(LF)$(BIND_KEYS)$(LF)$(NAMED_PID)$(LF)$(SESSION_KEY)
>+RST_EPILOG = "$(RNDC_CONF)$(LF)$(RNDC_KEY)$(LF)$(NAMED_CONF)$(LF)$(BIND_KEYS)$(LF)$(NAMED_PID)$(LF)$(SESSION_KEY)"
> 
> common_SPHINXOPTS =			\
> 	-W				\
>@@ -30,7 +30,7 @@ common_SPHINXOPTS =			\
> ALLSPHINXOPTS =					\
> 	$(common_SPHINXOPTS)			\
> 	-D today="$(RELEASE_DATE)"		\
>-	-D rst_epilog="$$(printf "$${RST_EPILOG}")"	\
>+	-D rst_epilog="${RST_EPILOG}"	\
> 	$(SPHINXOPTS)				\
> 	$(srcdir)
> 
>@@ -42,14 +42,14 @@ man_BIND_KEYS = .. |bind_keys| replace:: ``$(_)sysconfdir$(_)/bind.keys``
> man_NAMED_PID = .. |named_pid| replace:: ``$(_)runstatedir$(_)/named.pid``
> man_SESSION_KEY = .. |session_key| replace:: ``$(_)runstatedir$(_)/session.key``
> 
>-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)
>+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="$$(printf "$${man_RST_EPILOG}")"	\
>+	-D rst_epilog="${man_RST_EPILOG}"	\
> 	$(SPHINXOPTS)				\
> 	$(srcdir)
>

Actions: View | Diff

Attachments on bug 262773: 232721 | 232729