From 32c4636888e03025b5f01167cea6530a8fb1ce53 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 9 May 2007 09:56:51 +0100
Subject: [PATCH] Generate ChangeLog during make dist rather than during make.
 Commit a dummy ChangeLog so the autotools won't fail in git checkouts.

---
 .gitignore  | 1 -
 ChangeLog   | 2 ++
 Makefile.am | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 ChangeLog

diff --git a/.gitignore b/.gitignore
index 0c1d6c7..5c34b5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 run-with-tmp-session-bus.conf
 test/data
-ChangeLog
 *.pyc
 *.pyo
 .*.sw?
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..a8ccf81
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+In git versions of dbus-python, please use 'git-log' instead of referring to
+ChangeLog. A changelog is generated from the git history during 'make dist'.
diff --git a/Makefile.am b/Makefile.am
index f2d0232..2e00f70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,13 @@ cross-test-client:
 
 # === Documentation ===
 
-ChangeLog: always-rebuild
-	@if test -d $(top_srcdir)/.git; then \
-		if git-log --stat > ChangeLog; then \
+dist-hook:
+	chmod u+w $(distdir)/ChangeLog
+	if test -d $(top_srcdir)/.git; then \
+		if git-log --stat > $(distdir)/ChangeLog; then \
 			: ; \
 		else \
-			git-log > Changelog || exit 1; \
+			git-log > $(distdir)/ChangeLog; \
 		fi; \
 	fi
 
-- 
2.11.4.GIT