summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2003-03-28 09:56:07 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2003-03-28 09:56:07 +0000
commit86c14cf8ced9f8982510698e16a47c0ed28dbcce (patch)
treecd57ee371b8c31a0202163a7588d6725817a5908 /usr.bin
parent14b070e417008de1c7255c1312cd7158677bb12c (diff)
little cleanup;
systrace(1) ok provos@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/make.134
1 files changed, 17 insertions, 17 deletions
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 4445ad6fde2..2732bd092e4 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: make.1,v 1.49 2003/03/10 15:37:30 jmc Exp $
+.\" $OpenBSD: make.1,v 1.50 2003/03/28 09:56:06 jmc Exp $
.\" $OpenPackages$
.\" $NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
.\"
@@ -48,13 +48,13 @@
.Op Fl d Ar flags
.Op Fl f Ar makefile
.Op Fl I Ar directory
-.Bk -words
.Op Fl j Ar max_jobs
.Op Fl m Ar directory
-.Ek
.Op Fl V Ar variable
.Op Ar variable Ns No = Ns Ar value
+.Bk -words
.Op Ar target ...
+.Ek
.Sh DESCRIPTION
.Nm
is a program designed to simplify the maintenance of other programs.
@@ -107,7 +107,7 @@ that do not depend on the target whose creation caused the error.
Display the commands that would have been executed, but do not actually
execute them.
.It Fl q
-Do not execute any commands, but exit with status 0 if the specified targets
+Do not execute any commands, but exit with status 0 if the specified targets
are up-to-date, and 1 otherwise.
.It Fl r
Do not use the built-in rules specified in the system makefile.
@@ -196,8 +196,8 @@ Turns compatibility mode off, unless the
.Ar B
flag is also specified.
.It Fl m Ar directory
-Specify a directory in which to search for
-.Pa sys.mk
+Specify a directory in which to search for
+.Pa sys.mk
and makefiles included
via the <...> style.
Multiple directories can be added to form a search path.
@@ -245,7 +245,7 @@ and are usually created from them.
The exact relationship between the target and the source is determined
by the operator that separates them.
Note that the use of several targets is merely a shorthand for duplicate
-rules.
+rules.
Specifically,
.Bd -literal
target1 target2: depa depb
@@ -306,7 +306,7 @@ The
.Ic \&!
operator is a BSD extension.
.Pp
-As an extension, targets and sources may contain the shell wildcard
+As an extension, targets and sources may contain the shell wildcard
expressions
.Ql ? ,
.Ql * ,
@@ -341,7 +341,7 @@ operator is used.
.Pp
If a command line begins with a combination of the characters,
.Ql Ic @ ,
-.Ql Ic \-
+.Ql Ic \-
and/or
.Ql Ic + ,
the command is treated specially.
@@ -356,7 +356,7 @@ causes the command to be executed even if
has been specified (This can be useful to debug recursive Makefiles).
.El
.Pp
-The command is always executed using
+The command is always executed using
.Pa /bin/sh
in
.Qq set -e
@@ -798,7 +798,7 @@ is the substring of
to be replaced in
.Ar new_string
.El
-All modifiers are BSD extensions, except for the standard
+All modifiers are BSD extensions, except for the standard
.At V
style variable substitution.
.Sh INCLUDE STATEMENTS, CONDITIONALS AND FOR LOOPS
@@ -1043,11 +1043,11 @@ The syntax of a for loop is:
After the for
.Ar expression
is evaluated, it is split into words.
-On each iteration of the loop, one word is assigned to each
+On each iteration of the loop, one word is assigned to each
.Ar variable ,
in order,
-and these
-.Ar variables
+and these
+.Ar variables
are substituted in the
.Ic make-rules
inside the body of the for loop.
@@ -1306,7 +1306,7 @@ The determination of
.Va .OBJDIR
is contorted to the point of absurdity.
.Pp
-If you specify the same target several times in normal dependency rules,
+If the same target is specified several times in normal dependency rules,
.Nm
silently ignores all commands after the first non empty set of commands,
e.g., in
@@ -1331,7 +1331,7 @@ The evaluation of
in a test is very simple-minded.
Currently, the only form that works is
.Ql .if ${VAR} op something \.
-For instance, you should write tests as
+For instance, tests should be written as
.Ql .if ${VAR} = "string" ,
not the other way around, which doesn't work.
.Pp
@@ -1379,6 +1379,6 @@ A+=$I
.Ed
A will evaluate to a b c d after the loop, not z b c d.
.Pp
-The
+The
.Ql +
command modificator is ignored in parallel make mode.