[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-229-g2852234

[James Vega]

The following commit has been merged in the debian branch:
commit 2852234ea373a7ca4dd313edf79f9dee1f70b407
Author: James Vega <jamessan at debian.org>
Date:   Sat Jul 5 10:39:03 2008 -0400

    Update handling of DEB_BUILD_OPTIONS according to policy 3.8.0
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index fef7dfc..975df90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 BUILDER := $(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS = -Wall -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS+=-O0
 else
   CFLAGS+=-O2
@@ -17,17 +18,21 @@ endif
 
 MAKETEST := no
 ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-  ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+  ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
     MAKETEST := yes
   endif
 endif
 
-INSTALL+=install
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-  INSTALL+=-s
+INSTALL := install
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+  INSTALL += -s
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-CFLAGS+=$(if $(findstring nodebug,$(DEB_BUILD_OPTIONS)),,-g -Wall)
 CFGFLAGS:=--prefix=/usr --mandir='$${prefix}'/share/man --with-compiledby="$(BUILDER)"
 
 # "vim-tiny" features: in addition to those coming from the --with-features=xxx,

-- 
Vim packaging