Merge remote-tracking branch 'origin/maint'

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5fae4ce5848de9bf82f02b9518707a15eeda4c91..a98611901aab7d267c0e6e54a61e932fcc27b145 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,13 +88,15 @@ 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     \
+           --srcdir=$(srcdir)                          \
+           --since=$(gen_start_date) > $$cl.tmp &&     \
+         mv -f $$cl.tmp $$cl;                          \
        fi