From owner-svn-src-all@FreeBSD.ORG  Mon Jan 11 09:16:43 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EDB8106566B;
	Mon, 11 Jan 2010 09:16:43 +0000 (UTC)
	(envelope-from harti@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0DEFA8FC0A;
	Mon, 11 Jan 2010 09:16:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0B9Gg65012735;
	Mon, 11 Jan 2010 09:16:42 GMT (envelope-from harti@svn.freebsd.org)
Received: (from harti@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0B9Gg1A012733;
	Mon, 11 Jan 2010 09:16:42 GMT (envelope-from harti@svn.freebsd.org)
Message-Id: <201001110916.o0B9Gg1A012733@svn.freebsd.org>
From: Hartmut Brandt <harti@FreeBSD.org>
Date: Mon, 11 Jan 2010 09:16:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202070 - head/usr.bin/make
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 11 Jan 2010 09:16:43 -0000

Author: harti
Date: Mon Jan 11 09:16:42 2010
New Revision: 202070
URL: http://svn.freebsd.org/changeset/base/202070

Log:
  Fix the previous commit (still not used to svn vs. cvs). Use the
  define from paths.h for the default temporary directory and remove
  and unneccessary getenv call.

Modified:
  head/usr.bin/make/job.c

Modified: head/usr.bin/make/job.c
==============================================================================
--- head/usr.bin/make/job.c	Mon Jan 11 05:26:18 2010	(r202069)
+++ head/usr.bin/make/job.c	Mon Jan 11 09:16:42 2010	(r202070)
@@ -115,6 +115,7 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
+#include <paths.h>
 #include <string.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -139,7 +140,6 @@ __FBSDID("$FreeBSD$");
 #include "var.h"
 
 #define	TMPPAT	"makeXXXXXXXXXX"
-#define	TMPDIR	"/tmp"
 
 #ifndef USE_KQUEUE
 /*
@@ -1611,7 +1611,7 @@ JobStart(GNode *gn, int flags, Job *prev
 	}
 
 	if ((tdir = getenv("TMPDIR")) == NULL)
-		tdir = TMPDIR;
+		tdir = _PATH_TMP;
 
 	/*
 	 * If the -n flag wasn't given, we open up OUR (not the child's)
@@ -1807,8 +1807,6 @@ JobStart(GNode *gn, int flags, Job *prev
 		} else {
 			fprintf(stdout, "Remaking `%s'\n", gn->name);
 			fflush(stdout);
-			if ((tdir = getenv("TMPDIR")) == NULL)
-				tdir = TMPDIR;
 			snprintf(job->outFile, sizeof(job->outFile), "%s/%s",
 			    tdir, TMPPAT);
 			if ((job->outFd = mkstemp(job->outFile)) == -1)