From e7e0646db0869a8c4e45586c3f1904248a369c14 Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Wed, 7 Dec 2011 01:23:41 +0000
Subject: [PATCH] Ensure the ChangeLog is up-to-date when making a new
 distribution.

Thanks to Stefano Lattarini for this suggestion.
---
 Makefile.am       | 9 ++++++++-
 NEWS              | 3 +++
 doc/HOWTO-RELEASE | 2 --
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e0589b9..fb6cdcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,7 +179,14 @@ $(HTML): doc/manual-split
 # keep in anyway:
 dist-hook: doc/manual-split
 
-dist-hook: $(dist_man_MANS) ChangeLog
+dist-hook: $(dist_man_MANS)
+## If we are creating a distribution from a git checkout, ensure
+## the ChangeLog file is in sync the git repository.
+	if test -d $(top_srcdir)/.git; then \
+	  rm -f ChangeLog \
+	    && $(MAKE) $(AM_MAKEFLAGS) ChangeLog \
+	    && cp -f ChangeLog $(distdir)/ChangeLog; \
+	fi
 
 ChangeLog: doc/ChangeLog.OLD
 	@if [ -d .git ]; then \
diff --git a/NEWS b/NEWS
index 0c38927..feda14b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 News file for Stow.
 
+* Changes in version 2.1.2
+** Ensured the ChangeLog is up-to-date when making a new distribution.
+   Thanks to Stefano Lattarini for this suggestion.
 * Changes in version 2.1.1
 ** Fixed bug where ./configure --with-pmdir=X was ineffectual.
 ** Calculated the correct default value for pmdir based on the local Perl installation.
diff --git a/doc/HOWTO-RELEASE b/doc/HOWTO-RELEASE
index 18cb2e5..cb88041 100644
--- a/doc/HOWTO-RELEASE
+++ b/doc/HOWTO-RELEASE
@@ -18,8 +18,6 @@ How to make a new release of GNU Stow
 
   - Ensure all changes are committed to git.
 
-  - Run `rm ChangeLog' to ensure it will get rebuilt.
-
   - Run make distcheck and ensure that everything looks good.
     It should generate the distribution files for you.