---
.gitignore | 1 +
Makefile.am | 12 +++++++++++-
doc/index.rst | 1 +
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/.gitignore b/.gitignore
index e002438..59f9ffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@
/doc/api
/doc/build
/doc/html
+/doc/news.rst
/doc/*.in
/doc/*.png
diff --git a/Makefile.am b/Makefile.am
index 9e67492..ed34957 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,7 @@ CLEANFILES = \
autotools/replace_vars.sed \
daemons/ganeti-cleaner \
devel/upload \
+ doc/news.rst \
doc/examples/bash_completion \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
@@ -73,6 +74,7 @@ CLEANFILES = \
BUILT_SOURCES = \
ganeti \
srclinks \
+ doc/news.rst \
lib/_autoconf.py
nodist_pkgpython_PYTHON = \
@@ -148,7 +150,7 @@ docrst = \
doc/rapi.rst \
doc/security.rst
-doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+doc/html: $(docrst) doc/news.rst $(docpng) doc/conf.py configure.ac
@test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; }
mkdir -p doc/build/doctrees
@@ -315,6 +317,14 @@ daemons/ganeti-cleaner: daemons/ganeti-cleaner.in
stamp-directories \
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
+doc/news.rst: NEWS
+ set -e; \
+ { echo '.. This file is automatically updated at build time from $<.'; \
+ echo '.. Do not edit.'; \
+ echo; \
+ cat $<; \
+ } > $@
+
doc/examples/%: doc/examples/%.in stamp-directories \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
diff --git a/doc/index.rst b/doc/index.rst
index feeb8cf..8fb7a4b 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -19,6 +19,7 @@ Contents:
iallocator.rst
rapi.rst
devnotes.rst
+ news.rst
glossary.rst
Also see the :ref:`search`.
--
1.6.4.3
