Commit b76aac08 authored by Michael Hanselmann's avatar Michael Hanselmann

Include NEWS in documentation again

This was implemented in 350ecfec and reverted in 700bb843
after it broke “make distcheck”. With other changes in this
patch series this will work now.

Contributing to the original problem was that the news.rst file
was not distributed. When we distribute the build documentation,
the source must also be included (see Automake manual).
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent f727d134
......@@ -40,6 +40,7 @@
/doc/api
/doc/build
/doc/html
/doc/news.rst
/doc/*.in
/doc/*.png
......
......@@ -45,7 +45,8 @@ DIRS = \
MAINTAINERCLEANFILES = \
$(docpng) \
$(maninput)
$(maninput) \
doc/news.rst
maintainer-clean-local:
rm -rf doc/api doc/html
......@@ -148,7 +149,8 @@ docrst = \
doc/install.rst \
doc/locking.rst \
doc/rapi.rst \
doc/security.rst
doc/security.rst \
doc/news.rst
doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
@test -n "$(SPHINX)" || \
......@@ -163,6 +165,14 @@ doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
doc/html: doc/html/.stamp
doc/news.rst: NEWS
set -e; \
{ echo '.. This file is automatically updated at build time from $<.'; \
echo '.. Do not edit.'; \
echo; \
cat $<; \
} > $@
docdot = \
doc/arch-2.0.dot \
doc/design-2.1-lock-acquire.dot \
......
......@@ -19,6 +19,7 @@ Contents:
iallocator.rst
rapi.rst
devnotes.rst
news.rst
glossary.rst
Also see the :ref:`search`.
......
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