From 2f8d53a7989bf172931bfe5cfc7f7c4a9dbdd9ed Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Sat, 19 Apr 2014 12:45:11 +0100
Subject: maint: make ChangeLog generation more robust

* Makefile.am (gen-ChangeLog): Sync changes from GNU hello,
to ensure exit status is propagated, and to support an optional
git-log-fix file.
---
 Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 8a38acd8c..7eb2d5cba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,11 +105,12 @@ gen_start_date = 2008-02-08
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	$(AM_V_GEN)if test -d .git; then				\
+	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
+	  test -e "$$log_fix" && amend_git_log="--amend=$$log_fix";	\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	    --amend=$(srcdir)/build-aux/git-log-fix			\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	    $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+	    { rm -f $(distdir)/ChangeLog &&				\
+	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
 	fi
 
 ALL_RECURSIVE_TARGETS += distcheck-hook
-- 
cgit v1.2.3-54-g00ecf