[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. 83a1ffde77880a6750a918e063e0b69ea02acc04

[Bruno Kleinert]

The following commit has been merged in the master branch:
commit 83a1ffde77880a6750a918e063e0b69ea02acc04
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Mon Nov 30 22:54:42 2009 +0100

    Don't hardwire parallel=8 in rules file
    
    Don't hardwire 8 instances of make in debian/rules. Use DEB_BUILD_OPTIONS from
    the environment instead. (Closes: #558759). Also begin new -2 Debian release in
    changelog.

diff --git a/debian/changelog b/debian/changelog
index d80db95..ac7b415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+springlobby (0.34-2) unstable; urgency=low
+
+  [ Bruno "Fuddl" Kleinert]
+  * Don't hardwire parallel instances of make to 8 in debian/rules. Use
+    DEB_BUILD_OPTIONS instead. (Closes: #558759)
+
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Mon, 30 Nov 2009 22:51:14 +0100
+
 springlobby (0.34-1) unstable; urgency=low
 
   * Initial release (Closes: #550250).
diff --git a/debian/rules b/debian/rules
index 8f3a673..741a9fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,10 @@
 #export DH_VERBOSE=1
 
 PROGDIR := $(CURDIR)/debian/springlobby
-export DEB_BUILD_OPTIONS=parallel=8
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- --bindir=/usr/games --localedir=/usr/share/locale --disable-torrent-system

-- 
single/multiplayer lobby for the Spring RTS engine