From: Samual <samual@xonotic.org>
Date: Sat, 20 Aug 2011 10:20:39 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into akari/irc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fakari%2Firc;p=xonotic%2Fdarkplaces.git

Merge remote branch 'origin/master' into akari/irc

Conflicts:
	makefile.inc
---

6d89dcbc6b8565b1ee3cb7ec63213efde6c7d988
diff --cc makefile.inc
index 01e29996,dd55442a..fc63f7d4
--- a/makefile.inc
+++ b/makefile.inc
@@@ -210,9 -209,9 +210,9 @@@ DO_CC=$(CC) $(CFLAGS) -c $< -o $
  
  
  # Link
- LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=debug
- LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=profile
- LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release -lircclient
+ LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=debug
+ LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=profile
 -LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release
++LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release -lircclient
  
  
  ##### UNIX specific variables #####