From b76aac08817196893a89ccf6e2a2ff50df334cbe Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 26 Oct 2009 12:39:05 +0100
Subject: [PATCH] Include NEWS in documentation again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was implemented in 350ecfecca and reverted in 700bb84367
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: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
 .gitignore    |  1 +
 Makefile.am   | 14 ++++++++++++--
 doc/index.rst |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f47b2f3b..ca6b4b39c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@
 /doc/api
 /doc/build
 /doc/html
+/doc/news.rst
 /doc/*.in
 /doc/*.png
 
diff --git a/Makefile.am b/Makefile.am
index eae2cc5f5..0a0178630 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/doc/index.rst b/doc/index.rst
index e005bb92e..059016af7 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`.
-- 
GitLab