X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Frules;h=6806980156eb53f28775524f47027bad91750815;hb=c15f1d11fa95a036eaa2504527bbd5decf082db6;hp=4a02a49e5c4539c8d66963ca2e338fcd6994f880;hpb=6aa7dc839706a453f128a00f9040b31c597cfcfe;p=openvswitch

diff --git a/debian/rules b/debian/rules
index 4a02a49e..68069801 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
@@ -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
@@ -77,7 +80,6 @@ install-indep: build-indep
 		> debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 	chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 	cd debian/openvswitch-datapath-source/usr/src && tar -c modules | bzip2 -9 > openvswitch-datapath.tar.bz2 && rm -rf modules
-	install -m644 debian/openvswitch-pki-server.apache2 debian/openvswitch-pki-server/etc/apache2/sites-available/openvswitch-pki
 
 install-arch: build-arch
 	dh_testdir
@@ -99,7 +101,7 @@ binary-common:
 	dh_installexamples
 	dh_installdebconf
 	dh_installlogrotate
-	dh_installinit
+	dh_installinit -R
 	dh_installcron
 	dh_installman
 	dh_link