From 7a03d293c05c1d820c655e66861c83f014f5eba8 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann <hansmi@google.com> Date: Wed, 5 Jan 2011 18:48:29 +0100 Subject: [PATCH] Move doc/upgrade.rst to UPGRADE, copy at build-time This will allow distributions to install the file as text documentation. Signed-off-by: Michael Hanselmann <hansmi@google.com> Reviewed-by: Iustin Pop <iustin@google.com> --- .gitignore | 1 + Makefile.am | 10 ++++++++++ doc/upgrade.rst => UPGRADE | 0 3 files changed, 11 insertions(+) rename doc/upgrade.rst => UPGRADE (100%) diff --git a/.gitignore b/.gitignore index 7207b493b..b80b43bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ /doc/html /doc/install-quick.rst /doc/news.rst +/doc/upgrade.rst /doc/*.in /doc/*.png diff --git a/Makefile.am b/Makefile.am index 68998fd30..f394187c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ MAINTAINERCLEANFILES = \ $(maninput) \ doc/install-quick.rst \ doc/news.rst \ + doc/upgrade.rst \ vcs-version maintainer-clean-local: @@ -261,6 +262,14 @@ doc/install-quick.rst: INSTALL cat $<; \ } > $@ +doc/upgrade.rst: UPGRADE + 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 \ @@ -331,6 +340,7 @@ pkglib_SCRIPTS = \ EXTRA_DIST = \ NEWS \ + UPGRADE \ pylintrc \ autotools/build-bash-completion \ autotools/check-python-code \ diff --git a/doc/upgrade.rst b/UPGRADE similarity index 100% rename from doc/upgrade.rst rename to UPGRADE -- GitLab