X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/a349d8f9c4c5213c1e24a0c31f4ff4dbfda6c69c..d0b4f0acd54eeebcde98a1b4476b232dbece6048:/debian/rules

diff --git a/debian/rules b/debian/rules
index 470f08b..5c53f50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,12 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 INSTALL_PROGRAM += -s
 endif
 
+# Set DEB_BUILD_OPTIONS=parallel=N to do make -jN
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+PARALLEL = -j$(NUMJOBS)
+endif
+
 export INSTALL_DATA
 export INSTALL_SCRIPT
 export INSTALL_PROGRAM
@@ -68,7 +74,7 @@ build:
 	  echo ./config.status;\
 	  ./config.status;\
 	fi
-	$(MAKE) SENDMAIL=${SENDMAIL}
+	$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
 
 pkg-disorder: build
 	rm -rf debian/disorder
@@ -156,6 +162,7 @@ pkg-disorder-server: build
 	rm -rf debian/disorder-server/usr/share/man/man1
 	rm -rf debian/disorder-server/usr/share/man/man3
 	rm -f debian/disorder-server/usr/share/man/man5/disorder_config.5
+	rm -f debian/disorder-server/usr/share/man/man5/disorder_preferences.5
 	rm -f debian/disorder-server/usr/share/man/man5/disorder_protocol.5
 	find debian/disorder-server -name '*.la' -print0 | xargs -r0 rm -f
 	find debian/disorder-server -name '*.so.0' -print0 | xargs -r0 rm -f
@@ -289,7 +296,7 @@ binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
 binary-indep: 
 
 clean:
-	-$(MAKE) distclean
+	test -f Makefile && $(MAKE) distclean
 	rm -f config.cache
 	rm -f debian/files
 	rm -f debian/substvars.*