From 6e6519f3312806eac81b92d5b0514a254f6c3734 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Mon, 17 Dec 2007 22:11:38 +0000
Subject: Do not merge ChangeLog and ChangeLog.old

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

diff --git a/Makefile.am b/Makefile.am
index b8aa51d26..4256f0f86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ INTLTOOL = 			\
 
 EXTRA_DIST = 			\
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
 	CONTRIBUTORS		\
 	$(INTLTOOL)
@@ -43,13 +44,12 @@ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollke
 # Build ChangeLog from SVN history (r470 was the first ChangeLog-less checkin).
 # Only build this when in an svn checkout.
 
-ChangeLog: ChangeLog.old
+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
-	@cat $(top_srcdir)/ChangeLog.old >> $@
 
 dist: ChangeLog
 
-- 
cgit v1.2.3