r10863 - in /desktop/unstable/gtk+2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue May  8 09:10:43 2007
New Revision: 10863

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10863
Log:
* Also honor parallel=n in DEB_BUILD_OPTIONS.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=10863&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Tue May  8 09:10:43 2007
@@ -2,8 +2,9 @@
 
   * New patch, 15_default-fallback-icon-theme, sets the default
     gtk-fallback-icon-theme to "gnome"; closes: #421353.
-
- -- Loic Minier <lool at dooz.org>  Thu, 03 May 2007 21:26:54 +0200
+  * Also honor parallel=n in DEB_BUILD_OPTIONS.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 08 May 2007 11:10:05 +0200
 
 gtk+2.0 (2.10.12-1) unstable; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=10863&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules (original)
+++ desktop/unstable/gtk+2.0/debian/rules Tue May  8 09:10:43 2007
@@ -18,9 +18,10 @@
 # rules in this debian/rules Makefile can be built concurrently as well as
 # upstream rules in Makefile; all $(MAKE) invocations will inherit this flag,
 # if you recurse into debian/rules ($(MAKE)
-# -f debian/rules in rules), you need to pass a flag to avoid adding "-j2" when
+# -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when
 # the childs encounters this line
-MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j2 $(DEB_BUILD_OPTIONS_PARALLEL))
+DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)