r859 - trunk

[DONOTREPLY at icculus.org]

Author: tjw
Date: 2006-08-22 12:30:04 -0400 (Tue, 22 Aug 2006)
New Revision: 859

Modified:
   trunk/Makefile
Log:
* Add SVN version string to client console (clean up last commit)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-08-22 16:13:51 UTC (rev 858)
+++ trunk/Makefile	2006-08-22 16:30:04 UTC (rev 859)
@@ -140,10 +140,11 @@
   ifneq ($(SVN_REV),)
     SVN_VERSION=$(VERSION)_SVN$(SVN_REV)
     USE_SVN=1
-  else
-    SVN_VERSION=$(VERSION)
   endif
 endif
+ifneq ($(USE_SVN),1)
+    SVN_VERSION=$(VERSION)
+endif
 
 
 #############################################################################
@@ -726,7 +727,7 @@
   endif
 endif
 
-ifneq ($(USE_SVN),)
+ifeq ($(USE_SVN),1)
   BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\"
 endif
 
@@ -1040,7 +1041,7 @@
 $(B)/client/cl_cgame.o : $(CDIR)/cl_cgame.c; $(DO_CC)
 $(B)/client/cl_cin.o : $(CDIR)/cl_cin.c; $(DO_CC)
 $(B)/client/cl_console.o : $(CDIR)/cl_console.c; $(DO_CC)
-ifneq ($(USE_SVN),)
+ifeq ($(USE_SVN),1)
   $(B)/client/cl_console.o : .svn/entries
 endif
 $(B)/client/cl_input.o : $(CDIR)/cl_input.c; $(DO_CC)