From 813f7d34824153ac3259fdd34fce5710d3b7606c Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Thu, 5 Jul 2012 16:09:17 +0200
Subject: [PATCH] build: fix gen-ChangeLog call.

* Makefile.am: Be sure to catch errors, and fix option name
---
 Makefile.am | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index eef413fc..d5d3db28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,13 +66,14 @@ update-package-copyright-year:
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then		\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
-	    --strip-tab						\
-	    --strip-cherry-picked				\
-	    --no-cluster					\
-	    --amend=$(srcdir)/build-aux/git-log-fix		\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
-	  rm -f $(distdir)/ChangeLog;				\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
+	$(AM_V_GEN)if test -d $(srcdir)/.git; then	\
+	  cl=$(distdir)/ChangeLog &&			\
+	  rm -f $$cl.tmp &&				\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog	\
+	    --strip-tab					\
+	    --strip-cherry-pick				\
+	    --no-cluster				\
+	    --amend=$(srcdir)/build-aux/git-log-fix	\
+	    --since=$(gen_start_date) > $$cl.tmp &&	\
+	  mv -f $$cl.tmp $$cl;				\
 	fi
-- 
2.45.2