From 47fb7786c1ca1af7e29f5ef2fc58edfc29b53d22 Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Sun, 26 Jun 2005 10:14:43 +0000
Subject: [PATCH] Since the obj dir handling changes in the code have been
 reverted, revert them in the man page too (i.e., revert v1.115).

---
 usr.bin/make/make.1 | 57 ++++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 2b489502fdff..f8afc1d774f7 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.115 2005/06/23 02:31:31 lukem Exp $
+.\"	$NetBSD: make.1,v 1.116 2005/06/26 10:14:43 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd June 23, 2005
+.Dd June 17, 2005
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -531,9 +531,6 @@ Makefile parsing, lists only those targets encountered thus far.
 A path to the directory where
 .Nm
 was executed.
-Refer to the description of
-.Ql Ev PWD
-for more details.
 .It Ev MAKE
 The name that
 .Nm
@@ -596,31 +593,6 @@ For example, the printing of
 could be done as ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}.
 .It Va .OBJDIR
 A path to the directory where the targets are built.
-This defaults to the current directory
-.Pq Ql Va .CURDIR .
-If
-.Ql Ev MAKEOBJDIRPREFIX
-is set in the environment or on the command line and
-.Ql ${MAKEOBJDIRPREFIX}${.CURDIR}
-is a directory,
-use the latter.
-Otherwise, if
-.Ev MAKEOBJDIR
-is set in the environment or on the command line and
-expands to a directory,
-use that.
-.Ql Va .OBJDIR
-may be modified in the makefile as a global variable.
-In all cases, 
-.Nm
-will
-.Xr chdir 2
-to
-.Ql Va .OBJDIR
-and set
-.Ql Ev PWD
-to that directory before executing any targets.
-.
 .It Va .PARSEDIR
 A path to the directory of the current
 .Ql Pa Makefile
@@ -659,9 +631,7 @@ to the value of
 instead.
 This behaviour is disabled if
 .Ql Ev MAKEOBJDIRPREFIX
-is set or
-.Ql Ev MAKEOBJDIR
-contains a variable transform.
+is set.
 .Ql Ev PWD
 is set to the value of
 .Ql Va .OBJDIR
@@ -1559,15 +1529,22 @@ uses the following environment variables, if they exist:
 and
 .Ev PWD .
 .Pp
+If
 .Ev MAKEOBJDIRPREFIX
-and
-.Ev MAKEOBJDIR
-may only be set in the environment or on the command line to
+is set, then
 .Nm
-and not as makefile variables;
-see the description of
-.Ql Va .OBJDIR
-for more details.
+will
+.Xr chdir 2
+to ${MAKEOBJDIRPREFIX}${.CURDIR} if it exists.
+Otherwise if
+.Ev MAKEOBJDIR
+and the named directory exists
+.Nm
+will
+.Xr chdir 2
+to it.
+These actions are taken before any makefiles are read which is why they
+need to be set in the environment.
 .Sh FILES
 .Bl -tag -width /usr/share/mk -compact
 .It .depend