r13915 - packages/trunk/0ad/debian

[Vincent Cheng]

Author: vincentc-guest
Date: 2012-12-18 10:19:48 +0000 (Tue, 18 Dec 2012)
New Revision: 13915

Modified:
   packages/trunk/0ad/debian/rules
Log:
0ad: Update d/rules


Modified: packages/trunk/0ad/debian/rules
===================================================================
--- packages/trunk/0ad/debian/rules	2012-12-18 10:17:30 UTC (rev 13914)
+++ packages/trunk/0ad/debian/rules	2012-12-18 10:19:48 UTC (rev 13915)
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
-export NUMJOBS=$(shell getconf _NPROCESSORS_ONLN)
+ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
+	export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN)
+	export NUMJOBS=$(shell getconf _NPROCESSORS_ONLN)
+endif
 
 %:
 	dh $@ --parallel
@@ -22,8 +25,7 @@
 		--datadir=/usr/share/games/0ad \
 		--with-system-enet \
 		--with-system-nvtt \
-		--with-system-mozjs185 \
-		--without-fam
+		--with-system-mozjs185
 	
 	$(MAKE) config=release -j$(NUMJOBS) -C build/workspaces/gcc