From cc0a8f6a98afaf2993134206a1be7099c78a1538 Mon Sep 17 00:00:00 2001
From: yar <yar@FreeBSD.org>
Date: Tue, 4 Mar 2008 11:25:23 +0000
Subject: Revise the description of how .Ev MAKEFILE and .Va .MAKEFILE relate.
 The most important point is that -f option(s) are never copied from .Ev
 MAKEFILE to .Va .MAKEFILE by make(1), which is consistent with handling the
 command line.  (-f silently sit in .Ev MAKEFILE and go to make's children
 unless overwritten via .Va .MAKEFILE)

Bump .Dd.
---
 usr.bin/make/make.1 | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 8da2a35..034fda2 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -32,7 +32,7 @@
 .\"	@(#)make.1	8.8 (Berkeley) 6/13/95
 .\" $FreeBSD$
 .\"
-.Dd April 8, 2006
+.Dd March 4, 2008
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -655,31 +655,32 @@ command line,
 including
 .Fl f
 option(s).
-Its contents are stored in
-.Nm Ns 's
+After processing, its contents are stored in the
 .Va .MAKEFLAGS
-variable.
-All options and variable assignments specified on
+global variable, although any
+.Fl f
+options are omitted.
+Then all options and variable assignments specified on
 .Nm Ns 's
 command line, except for
 .Fl f ,
 are appended to the
 .Va .MAKEFLAGS
-variable which is then
-entered into the environment as
-.Ev MAKEFLAGS
-for all programs which
-.Nm
-executes.
+variable.
 .It Va .MAKEFLAGS
+Initially, this global variable contains
+.Nm Ns 's
+current run-time options from the environment
+and command line as described above, under
+.Ev MAKEFLAGS .
 By modifying the contents of the
 .Va .MAKEFLAGS
-variable, a makefile can alter the contents of the
+global variable, the makefile can alter the contents of the
 .Ev MAKEFLAGS
 environment variable made available for all programs which
 .Nm
 executes.
-(This includes adding or modifying
+(This includes adding
 .Fl f
 option(s).)
 Note that any options entered to
@@ -705,17 +706,15 @@ Compare with the
 special target below.
 .Pp
 To sum up what was said on
-.Fl f ,
-it can appear in
-.Va .MAKEFLAGS
+.Fl f :
+It can appear in
+.Ev MAKEFLAGS
 and affect the current
 .Nm
-at the same time only if inherited from
-.Ev MAKEFLAGS
-in 
+only if inherited from
 .Nm Ns 's
 initial environment.
-On the other hand, a
+At the same time, a
 .Fl f
 option from
 .Nm Ns 's
@@ -724,7 +723,14 @@ does affect
 .Nm ,
 but it is never transferred to
 .Va .MAKEFLAGS
-or further.
+or pushed down to child programs such as sub-makes.
+Finally,
+.Fl f
+can appear in
+.Va .MAKEFLAGS
+only if added by the makefile itself;
+it will affect sub-makes only, via
+.Ev MAKEFLAGS .
 .Pp
 When passing macro definitions and flag arguments in the
 .Ev MAKEFLAGS
-- 
cgit v1.1