[Pkg-erlang-commits] r1538 - erlang/trunk/debian

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Sep 19 18:29:36 UTC 2013


Author: sgolovan
Date: 2013-09-19 18:29:36 +0000 (Thu, 19 Sep 2013)
New Revision: 1538

Modified:
   erlang/trunk/debian/rules
Log:
[erlang]
Put jobs number into a variable.


Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2013-09-19 18:19:41 UTC (rev 1537)
+++ erlang/trunk/debian/rules	2013-09-19 18:29:36 UTC (rev 1538)
@@ -77,11 +77,13 @@
 
 JAVA_OPTIONS=-source 1.5 -target 1.5
 
+JOBS=4
+
 clean:
 	dh_testdir
 	dh_testroot
 	#
-	[ ! -f Makefile ] || ${MAKE} -j 4 clean
+	[ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean
 	rm -f lib/dialyzer/SKIP
 	#
 	# Remove installed erlang from debian/
@@ -172,7 +174,7 @@
 	#
 	echo "BUILDING HIPE VERSION (BUILD_HIPE: $(BUILD_HIPE))"
 	#
-	[ ! -f Makefile ] || ${MAKE} -j 4 clean
+	[ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean
 	rm -f lib/dialyzer/SKIP
 	#
 	CFLAGS="$(CFLAGS)" \
@@ -201,7 +203,7 @@
 	#
 	echo "BUILDING STANDARD VERSION (BUILD_HIPE: $(BUILD_HIPE))"
 	#
-	[ ! -f Makefile ] || ${MAKE} -j 4 clean
+	[ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean
 	rm -f lib/dialyzer/SKIP
 	#
 	CFLAGS="$(CFLAGS)" \
@@ -228,7 +230,7 @@
 	echo "*** do-install called for $(INSTALL_DIR)."
 
 	# Calls make install.
-	${MAKE} -j 4 DESTDIR=$(INSTALL_DIR) TYPE=$(TYPE) install
+	${MAKE} -j ${JOBS} DESTDIR=$(INSTALL_DIR) TYPE=$(TYPE) install
 
 	# Replace ROOTDIR in "erl" and "start" scripts for real rootdir
 	# If there's no erl or start then it's better to fail than silently continue
@@ -287,7 +289,7 @@
 	target=$$(basename $$(find make -type d |grep /)) ; \
 	PATH=$(ROOT_DIR)/bin:$$PATH ; \
 	for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
-	    ${MAKE} -j 4 -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
+	    ${MAKE} -j ${JOBS} -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
 	done
 	#
 	install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
@@ -307,27 +309,27 @@
 build-hipe-stamp: configure-hipe-stamp
 	dh_testdir
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
-	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j ${JOBS} TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j ${JOBS} TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
 endif
-	${MAKE} -j 4 TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
+	${MAKE} -j ${JOBS} TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
 	touch build-hipe-stamp
 
 build-stnd: build-stnd-stamp
 build-stnd-stamp: configure-stnd-stamp
 	dh_testdir
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
-	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j ${JOBS} TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j ${JOBS} TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
 endif
-	${MAKE} -j 4 TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
+	${MAKE} -j ${JOBS} TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
 	touch build-stnd-stamp
 
 docs: docs-stamp
 docs-stamp: $(INSTALL_RULE)
 	dh_testdir
-	PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) -j 4 docs
-	$(MAKE) -j 4 DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
+	PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) -j ${JOBS} docs
+	$(MAKE) -j ${JOBS} DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
 	#
 	sh debian/scripts/fixmanpages $(MAN_DIR) 2
 	#




More information about the Pkg-erlang-commits mailing list