X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Frules;h=76d11a0574d3b793645efd5b1cb634d40d133ab4;hb=c002dde70329b5553b79f3f1ad6d60771f4179c0;hp=bbc7357e54ddec9a09a94a95a1e2eb9068aa027c;hpb=bbe8d06ea2300ea907ab7efcaa66785a59095402;p=openvswitch

diff --git a/debian/rules b/debian/rules
index bbc7357e..76d11a05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,11 @@
 BUILD_NUMBER = 0
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-MAKEFLAGS += -j$(NUMJOBS)
+PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+PARALLEL =
 endif
+MAKEFLAGS += $(PARALLEL)
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
@@ -34,7 +36,7 @@ configure-stamp:
 	cd _debian && ( \
 		test -e Makefile || \
 		../configure --prefix=/usr --localstatedir=/var --enable-ssl \
-			--with-build-number=$(BUILD_NUMBER) \
+			--sysconfdir=/etc --with-build-number=$(BUILD_NUMBER) \
 			CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS))
 	touch configure-stamp
 
@@ -45,7 +47,8 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	$(MAKE) -C _debian
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	if $(MAKE) -C _debian check; then :; else \
+	if $(MAKE) -C _debian check TESTSUITEFLAGS='$(PARALLEL)'; then :; \
+	else \
 		cat _debian/tests/testsuite.log; \
 		exit 1; \
 	fi
@@ -98,7 +101,7 @@ binary-common:
 	dh_installexamples
 	dh_installdebconf
 	dh_installlogrotate
-	dh_installinit
+	dh_installinit -R
 	dh_installcron
 	dh_installman
 	dh_link