From 4a291f544ec43a0349f8322abff3265533c348c4 Mon Sep 17 00:00:00 2001
From: Joseph Carter <knghtbrd@debian.org>
Date: Sun, 2 Jan 2000 05:34:27 +0000
Subject: [PATCH] fixed VERSION not getting defined/used properly hopefully
 once and for all

---
 acconfig.h       | 2 +-
 configure.in     | 3 +--
 uquake/draw.c    | 8 ++++----
 uquake/gl_draw.c | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index c26e04f..4efca15 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,5 @@
 /* Version string */
-#define        VERSION         "0.1.0-pre"
+#undef VERSION
 
 /* Define if you have the XFree86 DGA extension */
 #undef HAS_DGA
diff --git a/configure.in b/configure.in
index e2732f5..cbfb715 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(common/crc.h)
 
 # Version of this release
-QF_VERSION="0.1.0"
+AC_DEFINE(VERSION,"0.1.0-pre")
 
 AC_CANONICAL_SYSTEM
 AC_LANG_C
@@ -414,7 +414,6 @@ AC_OBJEXT
 # Output files
 #
 
-AC_DEFINE_UNQUOTED(VERSION,"$QF_VERSION")
 AC_CONFIG_HEADER(common/config.h)
 AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile)
 
diff --git a/uquake/draw.c b/uquake/draw.c
index df4bed0..8ce8c09 100644
--- a/uquake/draw.c
+++ b/uquake/draw.c
@@ -549,17 +549,17 @@ void Draw_ConsoleBackground (int lines)
 
 // hack the version number directly into the pic
 #ifdef _WIN32
-	sprintf (ver, "QuakeForge (WinUQuake) v" VERSION);
+	sprintf (ver, "QuakeForge (WinUQuake) v%s" VERSION);
 	dest = conback->data + 320*186 + 320 - 11 - 8*strlen(ver);
 #elif defined(X11)
-	sprintf (ver, "QuakeForge (X11 UQuake) v" VERSION);
+	sprintf (ver, "QuakeForge (X11 UQuake) v%s" VERSION);
 	dest = conback->data + 320*186 + 320 - 11 - 8*strlen(ver);
 #elif defined(__linux__)
-	sprintf (ver, "QuakeForge (Linux UQuake) v" VERSION);
+	sprintf (ver, "QuakeForge (Linux UQuake) v%s" VERSION);
 	dest = conback->data + 320*186 + 320 - 11 - 8*strlen(ver);
 #else
 	dest = conback->data + 320 - 43 + 320*186;
-	sprintf (ver, "QuakeForge (Unknown UQuake) v" VERSION);
+	sprintf (ver, "QuakeForge (Unknown UQuake) v%s" VERSION);
 #endif
 
 	for (x=0 ; x<strlen(ver) ; x++)
diff --git a/uquake/gl_draw.c b/uquake/gl_draw.c
index 763abaf..f00f56a 100644
--- a/uquake/gl_draw.c
+++ b/uquake/gl_draw.c
@@ -410,9 +410,9 @@ void Draw_Init (void)
 
 	// hack the version number directly into the pic
 #if defined(__linux__)
-	sprintf (ver, "QuakeForge (Linux GL) v", VERSION);
+	sprintf (ver, "QuakeForge (Linux GL) v%s", VERSION);
 #else
-	sprintf (ver, "QuakeForge (Unkown GL) v", VERSION);
+	sprintf (ver, "QuakeForge (Unkown GL) v%s", VERSION);
 #endif
 	dest = cb->data + 320*186 + 320 - 11 - 8*strlen(ver);
 	y = strlen(ver);