From 50cf2c861c766ecec67a3a3d1925c3d74d7f618c Mon Sep 17 00:00:00 2001
From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Thu, 25 Aug 2005 18:37:36 +0000
Subject: [PATCH] Rocco Rutte: - fixup version.h generation to always use
 VERSION.svn (renamed from VERSION.data) via make(1) dependency (hopefully
 _this_ was the last time I had to deal with it)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@441 e385b8ad-14ed-0310-8656-cc95a2468c6d
---
 Makefile.am  | 8 ++------
 VERSION.date | 1 -
 VERSION.svn  | 1 +
 do-commit.sh | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 VERSION.date
 create mode 100644 VERSION.svn

diff --git a/Makefile.am b/Makefile.am
index 5087f3d..33865cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,13 +152,9 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
 		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
 			> keymap_alldefs.h
 
-version.h:
+version.h: $(srcdir)/VERSION.svn
 	echo "#undef MUTT_VERSION" > version.h
-	if test -f "$(srcdir)/.svn/entries" ; then \
-	  echo "#define MUTT_VERSION \"`cat $(srcdir)/VERSION.in`-r`grep revision $(srcdir)/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`\"" >> version.h ; \
-	else \
-	  echo "#define MUTT_VERSION \"`cat $(srcdir)/VERSION.in`-`cat $(srcdir)/VERSION.date`\"" >> version.h ; \
-	fi
+	echo "#define MUTT_VERSION \"`cat $(srcdir)/VERSION.in`-r`cat $(srcdir)/VERSION.svn`\"" >> version.h ; \
 
 reldate:
 	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
diff --git a/VERSION.date b/VERSION.date
deleted file mode 100644
index 534a21e..0000000
--- a/VERSION.date
+++ /dev/null
@@ -1 +0,0 @@
-440
diff --git a/VERSION.svn b/VERSION.svn
new file mode 100644
index 0000000..54bb288
--- /dev/null
+++ b/VERSION.svn
@@ -0,0 +1 @@
+441
diff --git a/do-commit.sh b/do-commit.sh
index 4e26a3d..3faaecb 100755
--- a/do-commit.sh
+++ b/do-commit.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 svn update
 CURREV=`svn info | grep '^Revision' | cut -d : -f 2`
-echo "`echo $CURREV+1 | bc`" > ./VERSION.date
+echo "`echo $CURREV+1 | bc`" > ./VERSION.svn
 svn commit "$@"
-- 
2.20.1