Tweaks

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3374 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 8 insertions, 3 deletions

diff --git a/configure b/configure
index fcd509faf..5ec38b8fb 100755
--- a/configure
+++ b/configure
@@ -873,7 +873,11 @@ sub writefiles {
 	print "Writing \033[1;32minspircd_config.h\033[0m\n";
 	# First File.. inspircd_config.h
 	chomp(my $incos = `uname -n -s -r`);
-	chomp(my $version = `sh ./src/version.sh` + " (r" + `./src/svn-rev.sh` + ")");
+	chomp(my $version = `sh ./src/version.sh`);
+        chomp(my $revision = " (r" + `./src/svn-rev.sh`);
+	$revision = $revision + ")";
+	my $version = $version + $revision;
+	chomp(my $revision2 = `./src/svn-rev.sh`);
 	open(FILEHANDLE, ">include/inspircd_config.h");
 	my $NL = $config{NICK_LENGT}+1;
 	my $CL = $config{CHAN_LENGT}+1;
@@ -885,6 +889,7 @@ sub writefiles {
 #define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
 #define MOD_PATH "$config{MODULE_DIR}"
 #define VERSION "$version"
+#define REVISION "$revision2"
 #define MAXCLIENTS $config{MAX_CLIENT}
 #define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
 #define NICKMAX $NL
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6c34f2c29..61c3b1004 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -138,7 +138,7 @@ std::string InspIRCd::GetRevision()
 	 */
 
 	/* XXX - this revision ID is NOT bumping automatically -- w00t */
-	std::stringstream Revision("$Revision$");
+	std::stringstream Revision(REVISION);
 	std::string single;
 	Revision >> single >> single;
 	return single;
diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index 048b314ff..f35c48ca6 100755
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-3371
+3373