svn commit: r317639 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Wed May  8 00:12:08 2013
New Revision: 317639
URL: http://svnweb.freebsd.org/changeset/ports/317639

Log:
  - Follow-up to r317320: fix MAKE_JOBS_NUMBER not being set
    if none of DISABLE_MAKE_JOBS or MAKE_JOBS_UNSAFE or
    MAKE_JOBS_SAFE or FORCE_MAKE_JOBS were set. This fixes
    the build for several ports updated in r317320.
  
  Reported by:	miwi
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue May  7 22:35:42 2013	(r317638)
+++ head/Mk/bsd.port.mk	Wed May  8 00:12:08 2013	(r317639)
@@ -2159,7 +2159,6 @@ CFLAGS:=	${CFLAGS:N-std=*} -std=${USE_CS
 
 # Multiple make jobs support
 .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
-MAKE_JOBS_NUMBER=	1
 _MAKE_JOBS=		#
 .else
 .if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
@@ -2171,6 +2170,10 @@ BUILD_FAIL_MESSAGE+=	"You have chosen to
 .endif
 .endif
 
+.if empty(MAKE_JOBS_NUMBER)
+MAKE_JOBS_NUMBER=	1
+.endif
+
 # ccache support
 # Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and
 # don't use if ccache already set in CC