[mw-devel] MW3 r1305 - trunk

[arthur at sucs.org]

Author: arthur
Date: 2012-11-29 17:28:57 +0000 (Thu, 29 Nov 2012)
New Revision: 1305

Modified:
   trunk/Makefile
   trunk/Makefile.common
Log:
fix the makefile to actually pass on the svn revision


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-11-29 16:59:31 UTC (rev 1304)
+++ trunk/Makefile	2012-11-29 17:28:57 UTC (rev 1305)
@@ -59,8 +59,8 @@
 clean:
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
-	$(MAKE) -C src/webclient $@ SRCROOT=$(SRCROOT)
-	$(MAKE) -C src/server $@ SRCROOT=$(SRCROOT)
+	$(MAKE) -C src/webclient $@
+	$(MAKE) -C src/server $@
 
 version:
 	@echo $(VERSION)

Modified: trunk/Makefile.common
===================================================================
--- trunk/Makefile.common	2012-11-29 16:59:31 UTC (rev 1304)
+++ trunk/Makefile.common	2012-11-29 17:28:57 UTC (rev 1305)
@@ -3,6 +3,7 @@
 VERSION_MAJOR = 2
 VERSION_MINOR = 17
 
+ifeq ($(VERSION_TWEAK),)
 ifeq ($(SVNVER),exported)
 # mw.rev is created after an export so we can rely on it to provide the svn rev here
 VERSION_TWEAK = $(shell cat $(SRCROOT)/mw.rev)
@@ -12,6 +13,7 @@
 endif
 VERSION_TWEAK = $(SVNVER)
 endif
+endif
 
 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_TWEAK)