From b8607414ea0e41c44a09d31ebcd0437a3c867a24 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Sat, 29 Dec 2007 15:49:47 +0000
Subject: merge git work

svn path=/trunk/; revision=518
---
 Makefile.am | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 2d207666b..4256f0f86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST = 			\
 	$(INTLTOOL)
 
 DISTCLEANFILES = 		\
-        ChangeLog               \
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update
@@ -42,9 +41,15 @@ DISTCLEANFILES = 		\
 # uninstall.
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
-ChangeLog: Makefile.am
-	git-log --pretty=short > ChangeLog
-	
+# Build ChangeLog from SVN history (r470 was the first ChangeLog-less checkin).
+# Only build this when in an svn checkout.
+
+ChangeLog:
+	@if test -f $(top_srcdir)/.svn/entries; then \
+		svn log -v --xml -r HEAD:470 $(SVN_ROOT)/$(SVN_MODULE) | \
+			xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
+				 --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
+	fi
 
 dist: ChangeLog
 
-- 
cgit v1.2.3