From owner-svn-src-all@FreeBSD.ORG  Sun Aug  4 07:10:17 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3C6A2C38;
 Sun,  4 Aug 2013 07:10:17 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A0EE2107;
 Sun,  4 Aug 2013 07:10:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r747AHTf050182;
 Sun, 4 Aug 2013 07:10:17 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r747AG14050180;
 Sun, 4 Aug 2013 07:10:16 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201308040710.r747AG14050180@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sun, 4 Aug 2013 07:10:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253925 - head/contrib/bmake
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Aug 2013 07:10:17 -0000

Author: sjg
Date: Sun Aug  4 07:10:16 2013
New Revision: 253925
URL: http://svnweb.freebsd.org/changeset/base/253925

Log:
  Move the call to Job_SetPrefix() to Job_Init() so that
  makefiles have had a chance to set .MAKE.JOB.PREFIX

Modified:
  head/contrib/bmake/job.c
  head/contrib/bmake/main.c

Modified: head/contrib/bmake/job.c
==============================================================================
--- head/contrib/bmake/job.c	Sun Aug  4 06:36:17 2013	(r253924)
+++ head/contrib/bmake/job.c	Sun Aug  4 07:10:16 2013	(r253925)
@@ -2214,6 +2214,7 @@ Job_SetPrefix(void)
 void
 Job_Init(void)
 {
+    Job_SetPrefix();
     /* Allocate space for all the job info */
     job_table = bmake_malloc(maxJobs * sizeof *job_table);
     memset(job_table, 0, maxJobs * sizeof *job_table);

Modified: head/contrib/bmake/main.c
==============================================================================
--- head/contrib/bmake/main.c	Sun Aug  4 06:36:17 2013	(r253924)
+++ head/contrib/bmake/main.c	Sun Aug  4 07:10:16 2013	(r253925)
@@ -1026,7 +1026,6 @@ main(int argc, char **argv)
 		snprintf(pn, sizeof(pn), "%s[%d]", progname, makelevel);
 		progname = bmake_strdup(pn);
 	}
-	Job_SetPrefix();
 
 #ifdef USE_META
 	meta_init();