More distcheck fixes: fix ChangeLog rule, don't insist on a ChangeLog in po/.

2 files changed, 7 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index d54ddd4..19cd869 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,14 @@
 
 SUBDIRS = data docs librazor src po
 
-# Creating ChangeLog from git log (taken from cairo/Makefile.am):
-ChangeLog: $(srcdir)/ChangeLog
+GIT=./missing --run git --git-dir=$(srcdir)/.git
 
 $(srcdir)/ChangeLog:
-	@if test -d "$(srcdir)/.git"; then \
-	  (cd "$(srcdir)" && \
-	  ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
+	if test $@ -ot $(srcdir)/.git/$$($(GIT) rev-parse --symbolic-full-name HEAD); then \
+		git-log --stat > $@;		\
 	fi
 
-.PHONY: ChangeLog $(srcdir)/ChangeLog
+.PHONY: $(srcdir)/ChangeLog
 
 EXTRA_DIST = 			\
 	TODO	 		\
diff --git a/autogen.sh b/autogen.sh
index 6961b15..2dce6f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -86,6 +86,9 @@ gtkdocize --copy --flavour no-tmpl
 
 intltoolize --copy --force --automake                  || exit 1
 
+# Enough with the ChangeLog madness!
+sed -ie 's/ChangeLog//' po/Makefile.in.in
+
 conf_flags="--enable-maintainer-mode"
 
 if test x$NOCONFIGURE = x; then