diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1 index f8907b2f29b5..d77245229798 100644 --- a/usr.bin/make/make.1 +++ b/usr.bin/make/make.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.54 2001/10/23 06:32:38 jmc Exp $ +.\" $NetBSD: make.1,v 1.55 2001/11/12 01:31:21 tv Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -449,30 +449,15 @@ i.e. .Ql \&$$ expands to a single dollar sign. -.It Va .MAKE -The name that -.Nm -was executed with .Pq Va argv[0] .It Va .CURDIR A path to the directory where .Nm was executed. -.It Va .OBJDIR -A path to the directory where the targets are built. -.It Va .PARSEDIR -A path to the directory of the current -.Ql Pa Makefile -being parsed. -.It Va .PARSEFILE -The basename of the current -.Ql Pa Makefile -being parsed. -This variable and -.Ql Va .PARSEDIR -are both set only while the -.Ql Pa Makefiles -are being parsed. +.It Va .MAKE +The name that +.Nm +was executed with .It Ev MAKEFLAGS The environment variable .Ql Ev MAKEFLAGS @@ -501,6 +486,34 @@ by appending their names to is re-exported whenever .Ql Va .MAKEOVERRIDES is modified. +.It Va MAKE_PRINT_VAR_ON_ERROR +When +.Nm +stops due to an error, it prints its name and the value of +.Ql Va .CURDIR +as well as the value of any variables named in +.Ql Va MAKE_PRINT_VAR_ON_ERROR . +.It Va .newline +This variable is simply assigned a newline character as its value. +This allows expansions using the :@ modifier to put a newline between +iterations of the loop rather than a space. For example, the printing of +.Ql Va MAKE_PRINT_VAR_ON_ERROR +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. +.It Va .PARSEDIR +A path to the directory of the current +.Ql Pa Makefile +being parsed. +.It Va .PARSEFILE +The basename of the current +.Ql Pa Makefile +being parsed. +This variable and +.Ql Va .PARSEDIR +are both set only while the +.Ql Pa Makefiles +are being parsed. .It Ev PWD Alternate path to the current directory. .Nm @@ -525,19 +538,6 @@ is set to the value of for all programs which .Nm executes. -.It Va MAKE_PRINT_VAR_ON_ERROR -When -.Nm -stops due to an error, it prints its name and the value of -.Ql Va .CURDIR -as well as the value of any variables named in -.Ql Va MAKE_PRINT_VAR_ON_ERROR . -.It Va .newline -This variable is simply assigned a newline character as its value. -This allows expansions using the :@ modifier to put a newline between -iterations of the loop rather than a space. For example, the printing of -.Ql Va MAKE_PRINT_VAR_ON_ERROR -could be done as ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}. .El .Pp Variable expansion may be modified to select or modify each word of the