[SCM] Debian packaging of wesnoth branch, experimental, updated. 4d346b8eec2bc579c63020b9466514cb1c211d3f

[Gerfried Fuchs]

The following commit has been merged in the experimental branch:
commit 4d346b8eec2bc579c63020b9466514cb1c211d3f
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Sat Apr 3 18:47:09 2010 +0200

    support for DEB_BUILD_OPTIONS="parallel=X"

diff --git a/debian/changelog b/debian/changelog
index 2881fd1..22451cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.8 (1:1.8-2) experimental; urgency=low
+
+  * Support for DEB_BUILD_OPTIONS="parallel=X" added, thanks to prodding by
+    Marc Brockschmidt.
+
+ -- 
+
 wesnoth-1.8 (1:1.8-1) experimental; urgency=low
 
   * New upstream stable release!
diff --git a/debian/rules b/debian/rules
index 85dc45f..dc58fbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,16 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
 else
         CFLAGS += -O2
 endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 
 # calculate the version strings
 MAJOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f1)

-- 
Debian packaging of wesnoth