From 0b9347305b94b0c0bc51db16a937a2f09459e1ef Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 10 Apr 2016 10:56:07 +0200 Subject: Fix Changelog generation --- ChangeLog | 2 ++ Makefile.am | 20 ++++++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e69de29b..019ffa6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,2 @@ +The ChangeLog is auto-generated when releasing. If you are seeing this, use +'git log' for a detailed list of changes. diff --git a/Makefile.am b/Makefile.am index 193b6301..6d8e8565 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,20 +14,16 @@ EXTRA_DIST = \ DISTCLEANFILES=intltool-extract intltool-merge intltool-update -dist-hook: - @if test -d "$(srcdir)/.git"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ - || ( rm -f ChangeLog.tmp ; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo A git clone is required to generate a ChangeLog >&2; \ +# Build ChangeLog from GIT history +ChangeLog: + $(AM_V_GEN) if test -d $(top_srcdir)/.git; then \ + GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \ fi +dist: ChangeLog + +.PHONY: ChangeLog + # we don't want to install mo files, all translations are already stored # in theme files install-data-local: -- cgit v1.2.1