summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2009-03-15 13:15:48 +0000
committerChristian Persch <chpe@src.gnome.org>2009-03-15 13:15:48 +0000
commit2e987a57b7e16238db7efb9c7f3b8ce25a869caa (patch)
tree11ce784bb07e1e1f75c56462cb1b8c2ff92829f4
parentd6248c90341bd2bdd5d7fc0b543310ae7ab854ba (diff)
downloadepiphany-2e987a57b7e16238db7efb9c7f3b8ce25a869caa.tar.gz
Remove SVN ChangeLog rule
svn path=/branches/gnome-2-26/; revision=8894
-rw-r--r--Makefile.am13
-rw-r--r--configure.ac11
2 files changed, 2 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am
index 7de89095d..f9d5e29b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,17 +36,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
# Ignore gtk theme cache files on distcheck
distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'
-# Build ChangeLog from SVN history (r7394 was the first ChangeLog-less checkin).
-# Only build this when in an svn checkout.
-
-ChangeLog:
- @if test -f $(top_srcdir)/.git/HEAD; then \
- git log --stat > $@; \
- elif test -f $(top_srcdir)/.svn/entries; then \
- svn log -v --xml -r HEAD:7394 $(SVN_ROOT)/$(SVN_MODULE)/$(SVN_BRANCH) | \
- xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
- --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
- fi
+ChangeLog: $(top_srcdir)/.git/HEAD
+ git log --stat > $@
dist: ChangeLog
diff --git a/configure.ac b/configure.ac
index cb4da3b26..888829187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,6 @@ m4_define([epiphany_version_extra],[])
m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro()epiphany_version_extra])
m4_define([epiphany_build_id],[20080528]) # The date of the 2.22.2 release
-# This can be either "trunk" or "branches/gnome-x-y"
-m4_define([epiphany_branch],["branches/gnome-2-26"])
-
AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
AC_PREREQ([2.59])
@@ -718,14 +715,6 @@ AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name])
GNOME_DOC_INIT
GTK_DOC_CHECK([1.0])
-# ****************************
-# SVN for ChangeLog generation
-# ****************************
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[epiphany])
-AC_SUBST([SVN_BRANCH],[epiphany_branch])
-
# ************
# Output files
# ************