From owner-svn-src-all@FreeBSD.ORG  Fri May 17 19:37: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])
 by hub.freebsd.org (Postfix) with ESMTP id 30DC170;
 Fri, 17 May 2013 19:37:17 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 22B231F5;
 Fri, 17 May 2013 19:37:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HJbHI7090183;
 Fri, 17 May 2013 19:37:17 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HJbGgP090181;
 Fri, 17 May 2013 19:37:16 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201305171937.r4HJbGgP090181@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 17 May 2013 19:37:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250750 - in head: contrib/bmake usr.bin/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: Fri, 17 May 2013 19:37:17 -0000

Author: sjg
Date: Fri May 17 19:37:16 2013
New Revision: 250750
URL: http://svnweb.freebsd.org/changeset/base/250750

Log:
  We really need to get the bsd.own.mk from this tree so the
  correct options are set.
  Also defined NO_PWD_OVERRIDE to match behavior of fmake.

Modified:
  head/contrib/bmake/main.c
  head/usr.bin/bmake/Makefile.inc

Modified: head/contrib/bmake/main.c
==============================================================================
--- head/contrib/bmake/main.c	Fri May 17 19:13:31 2013	(r250749)
+++ head/contrib/bmake/main.c	Fri May 17 19:37:16 2013	(r250750)
@@ -796,7 +796,10 @@ main(int argc, char **argv)
 	Lst targs;	/* target nodes to create -- passed to Make_Init */
 	Boolean outOfDate = FALSE; 	/* FALSE if all targets up to date */
 	struct stat sb, sa;
-	char *p1, *path, *pwd;
+	char *p1, *path;
+#ifndef NO_PWD_OVERRIDE
+	char *pwd;
+#endif
 	char mdpath[MAXPATHLEN];
 #ifdef FORCE_MACHINE
 	const char *machine = FORCE_MACHINE;

Modified: head/usr.bin/bmake/Makefile.inc
==============================================================================
--- head/usr.bin/bmake/Makefile.inc	Fri May 17 19:13:31 2013	(r250749)
+++ head/usr.bin/bmake/Makefile.inc	Fri May 17 19:37:16 2013	(r250750)
@@ -1,5 +1,12 @@
 # $FreeBSD$ 
 
+# we need the up to date bsd.own.mk
+.if ${.CURDIR:M*make} == ""
+.sinclude "share/mk/bsd.own.mk"
+.else
+.sinclude "../../share/mk/bsd.own.mk"
+.endif
+# the above should have found it...
 .include "bsd.own.mk"
 
 .if defined(.PARSEDIR)
@@ -16,3 +23,4 @@ NO_SHARED?=     YES
 .endif
 
 WARNS=3
+CFLAGS+= -DNO_PWD_OVERRIDE