Attachment 228610 Details for Bug 211948 – make(1) patch

[patch] make(1) patch

make.1.patch (text/plain), 5.19 KB, created by Felix Johnson on 2021-10-12 04:43:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Johnson

Created: 2021-10-12 04:43:04 UTC

Size: 5.19 KB

patch

obsolete

>diff --git a/contrib/bmake/make.1 b/contrib/bmake/make.1
>index b50a3b4a74b..7a3934258e3 100644
>--- a/contrib/bmake/make.1
>+++ b/contrib/bmake/make.1
>@@ -78,7 +78,7 @@ and makefiles, please refer to
> .Pp
> .Nm
> will prepend the contents of the
>-.Va MAKEFLAGS
>+.Ev MAKEFLAGS
> environment variable to the command line arguments before parsing them.
> .Pp
> The options are as follows:
>@@ -104,11 +104,18 @@ to be 1, in the global scope.
> Turn on debugging, and specify which portions of
> .Nm
> are to print debugging information.
>+.Pp
> Unless the flags are preceded by
> .Ql \-
> they are added to the
>-.Va MAKEFLAGS
>+.Ev MAKEFLAGS
> environment variable and will be processed by any child make processes.
>+Flags preceded by
>+.Ql \-
>+are used to control debugging output for the current
>+.Nm
>+process, and are not used by child make processes.
>+.Pp
> By default, debugging information is printed to standard error,
> but this can be changed using the
> .Ar F
>@@ -186,7 +193,7 @@ Print debugging information about "meta" mode decisions about targets.
> Print debugging information about making targets, including modification
> dates.
> .It Ar n
>-Don't delete the temporary command scripts created when running commands.
>+Do not delete the temporary command scripts created when running commands.
> These temporary scripts are created in the directory
> referred to by the
> .Ev TMPDIR
>@@ -387,11 +394,11 @@ Treat any warnings during makefile parsing as errors.
> .It Fl w
> Print entering and leaving directory messages, pre and post processing.
> .It Fl X
>-Don't export variables passed on the command line to the environment
>+Do not export variables passed on the command line to the environment
> individually.
> Variables passed on the command line are still exported
> via the
>-.Va MAKEFLAGS
>+.Ev MAKEFLAGS
> environment variable.
> This option may be useful on systems which have a small limit on the
> size of command arguments.
>@@ -817,7 +824,7 @@ even if the target is not tagged with
> .Ic .MAKE
> The default is
> .Ql Pa yes
>-for backwards compatability with
>+for backwards compatibility with
> .Fx 9.0
> and earlier.
> .It Va .MAKE.DEPENDFILE
>@@ -859,7 +866,7 @@ would produce tokens like
> making it easier to track the degree of parallelism being achieved.
> .It Ev MAKEFLAGS
> The environment variable
>-.Ql Ev MAKEFLAGS
>+.Ev MAKEFLAGS
> may contain anything that
> may be specified on
> .Nm Ns 's
>@@ -867,7 +874,7 @@ command line.
> Anything specified on
> .Nm Ns 's
> command line is appended to the
>-.Ql Ev MAKEFLAGS
>+.Ev MAKEFLAGS
> variable which is then
> entered into the environment for all programs which
> .Nm
>@@ -913,7 +920,7 @@ into "compat" mode.
> Puts
> .Nm
> into "meta" mode, where meta files are created for each target
>-to capture the command run, the output generated and if
>+to capture the command run, the output generated, and if
> .Xr filemon 4
> is available, the system calls which are of interest to
> .Nm .
>@@ -958,7 +965,7 @@ is True, when a .meta file is created, mark the target
> .Ic .SILENT .
> .El
> .It Va .MAKE.META.BAILIWICK
>-In "meta" mode, provides a list of prefixes which
>+In "meta" mode, this variable provides a list of prefixes which
> match the directories controlled by
> .Nm .
> If a file that was generated outside of
>@@ -993,14 +1000,14 @@ The default value is:
> .It Va .MAKEOVERRIDES
> This variable is used to record the names of variables assigned to
> on the command line, so that they may be exported as part of
>-.Ql Ev MAKEFLAGS .
>+.Ev MAKEFLAGS .
> This behavior can be disabled by assigning an empty value to
> .Ql Va .MAKEOVERRIDES
> within a makefile.
> Extra variables can be exported from a makefile
> by appending their names to
> .Ql Va .MAKEOVERRIDES .
>-.Ql Ev MAKEFLAGS
>+.Ev MAKEFLAGS
> is re-exported whenever
> .Ql Va .MAKEOVERRIDES
> is modified.
>@@ -1092,7 +1099,7 @@ is set in the environment or on the command line.)
> .Ev ${.CURDIR}
> .El
> .Pp
>-Variable expansion is performed on the value before it's used,
>+Variable expansion is performed on the value before it is used,
> so expressions such as
> .Dl ${.CURDIR:S,^/usr/src,/var/obj,}
> may be used.
>@@ -1403,7 +1410,7 @@ and an
> .Xr ed 1 Ns \-style
> string
> .Ar replacement .
>-Normally, the first occurrence of the pattern
>+Normally, the first occurrence of
> .Ar pattern
> in each word of the value is substituted with
> .Ar replacement .
>@@ -1922,7 +1929,7 @@ of a string comparison.
> When
> .Nm
> is evaluating one of these conditional expressions, and it encounters
>-a (white-space separated) word it doesn't recognize, either the
>+a (white-space separated) word it does not recognize, either the
> .Dq make
> or
> .Dq defined
>@@ -2049,8 +2056,8 @@ This source prevents this target from being selected.
> .It Ic .OPTIONAL
> If a target is marked with this attribute and
> .Nm
>-can't figure out how to create it, it will ignore this fact and assume
>-the file isn't needed or already exists.
>+cannot figure out how to create it, it will ignore this fact and assume
>+the file is not needed or already exists.
> .It Ic .PHONY
> The target does not
> correspond to an actual file; it is always considered to be out of date,
>@@ -2134,7 +2141,7 @@ This is sort of a
> rule for any target (that was used only as a
> source) that
> .Nm
>-can't figure out any other way to create.
>+cannot figure out any other way to create.
> Only the shell script is used.
> The
> .Ic .IMPSRC

Actions: View | Diff

Attachments on bug 211948: 173791 | 228610