[Xfce4-commits] <terminal:master> Create ChangeLog only in dist.

[Nick Schermer]

Updating branch refs/heads/master
         to b7d368096aca49b5ade293863abe10f7baee53b9 (commit)
       from ada366b1b3bbcc35201f40c58b0c5a72f23c2726 (commit)

commit b7d368096aca49b5ade293863abe10f7baee53b9
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Dec 5 00:55:45 2009 +0100

    Create ChangeLog only in dist.

 Makefile.am |   11 +++++++++--
 autogen.sh  |    9 ---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 44edb31..93164fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 SUBDIRS = \
 	doc \
 	icons \
@@ -24,6 +22,15 @@ TerminalHelp: TerminalHelp.in Makefile
 		> TerminalHelp.gen
 	mv TerminalHelp.gen TerminalHelp
 
+.PHONY: ChangeLog
+
+ChangeLog: Makefile
+	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
+	&& mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
+	|| (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
 desktopdir = $(datadir)/applications
 desktop_in_files = Terminal.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/autogen.sh b/autogen.sh
index 5aef7d9..f9baf42 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,15 +20,6 @@ EOF
   exit 1
 }
 
-# Build changelog
-if test -d .git; then
-  git log --pretty=short --shortstat 2> /dev/null > ChangeLog.tmp \
-  && mv ChangeLog.tmp ChangeLog
-fi
-if test ! -f ChangeLog; then
-  echo "A git checkout and 'git log' is required to generate this file." > ChangeLog
-fi
-
 exec xdt-autogen "$@"
 
 # vi:set ts=2 sw=2 et ai: