summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am12
-rw-r--r--configure.ac8
2 files changed, 3 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 4256f0f8..46101580 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,15 +41,9 @@ DISTCLEANFILES = \
# uninstall.
distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
-# 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
+ChangeLog: Makefile.am
+ git-log --pretty=short > ChangeLog
+
dist: ChangeLog
diff --git a/configure.ac b/configure.ac
index cda69770..c86b1190 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,14 +90,6 @@ PKG_CHECK_MODULES(EMPATHY,
])
# -----------------------------------------------------------
-# SVN for ChangeLog generation
-# -----------------------------------------------------------
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[empathy])
-AC_SUBST([SVN_BRANCH],["trunk"])
-
-# -----------------------------------------------------------
# Language Support
# -----------------------------------------------------------