X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Frules;h=bbc7357e54ddec9a09a94a95a1e2eb9068aa027c;hb=a404826e90632541d50f58d651271e7a8752cc1f;hp=6e99ff6ec915b6e80ceddd3817ba7cdc92d8e1d1;hpb=ff8c6aa136118c65af50dd9dc8ed41b7fa2dcc03;p=openvswitch

diff --git a/debian/rules b/debian/rules
index 6e99ff6e..bbc7357e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ configure-stamp:
 	dh_testdir
 	test -e configure || ./boot.sh
 	test -d _debian || mkdir _debian
+	echo $(DEB_BUILD_OPTIONS)
 	echo $$CC
 	cd _debian && ( \
 		test -e Makefile || \
@@ -76,7 +77,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
@@ -120,3 +120,9 @@ binary-arch: install-arch
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+
+# This GNU make extensions disables parallel builds for the current Makefile
+# but not for sub-Makefiles.  This is appropriate here because build-arch and
+# build-indep both invoke "make" on OVS, which can update some of the same
+# targets in ways that conflict (e.g. both update tests/testsuite).
+.NOTPARALLEL: