[SCM] ardour/master: Let CDBS resolve if parallel build is enabled, and then use it unconditionally (i.e. without consulting /proc/cpuinfo).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3438992db0aaa70f9a55ed238080ea88fbf255d5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jan 12 13:02:37 2011 +0100

    Let CDBS resolve if parallel build is enabled, and then use it unconditionally (i.e. without consulting /proc/cpuinfo).

diff --git a/debian/rules b/debian/rules
index 8f35d26..2133c48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,16 +12,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_CLEAN_EXCLUDE=debian/tmp
 DEB_DESTDIR = $(CURDIR)/debian/tmp/
 
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
-	PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
-		sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
-	ifeq ($(DEB_BUILD_OPTIONS),$(PARALLEL_JOBS))
-		PARALLEL_JOBS := $(shell if [ -f /proc/cpuinfo ]; \
-			then echo `cat /proc/cpuinfo | grep 'processor' | wc -l`; \
-			else echo 1; fi)
-	endif
-	NJOBS := -j$(PARALLEL_JOBS)
-endif
+NJOBS = $(DEB_PARALLEL_JOBS:%=-j%)
 
 ALTIVEC_OPT_FLAGS := -O3 -mcpu=7400 -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
 I686_OPT_FLAGS := -O3 -march=i686 -mmmx

-- 
ardour Debian packaging