summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2007-12-17 22:11:38 +0000
committerXavier Claessens <xclaesse@src.gnome.org>2007-12-17 22:11:38 +0000
commit6e6519f3312806eac81b92d5b0514a254f6c3734 (patch)
tree3f0f0fbd5159869c4c30edca63eae17912b4f736 /Makefile.am
parentd853bea8e7e8a51aad15b479fcf39d7e95c4022a (diff)
Do not merge ChangeLog and ChangeLog.oldEMPATHY_0_21_4
svn path=/trunk/; revision=486
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files 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