summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorsjg <sjg@NetBSD.org>2011-03-27 19:47:46 +0000
committersjg <sjg@NetBSD.org>2011-03-27 19:47:46 +0000
commitc033c26baa0fcd2f960e6e4eef27e1b8c52b4c92 (patch)
treeb4db0f9fec677d5ab426ea4433d31be89d1322e6 /usr.bin/make
parent86ab2513ee7b8a6224b01d79855943f0c85c5e72 (diff)
Use curdirOk as the token
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/make.14
-rw-r--r--usr.bin/make/meta.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 9d554b8b2e4..fb912268158 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.184 2011/03/27 19:39:21 sjg Exp $
+.\" $NetBSD: make.1,v 1.185 2011/03/27 19:47:46 sjg Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -780,7 +780,7 @@ to capture the command run, the output generated and if
is available, the system calls which are of interest to
.Nm .
The captured output can be very useful when diagnosing errors.
-.It Pa curdir= Ar bf
+.It Pa curdirOk= Ar bf
Normally
.Nm
will not create .meta files in
diff --git a/usr.bin/make/meta.c b/usr.bin/make/meta.c
index f5419afa058..b2d91637c4e 100644
--- a/usr.bin/make/meta.c
+++ b/usr.bin/make/meta.c
@@ -550,8 +550,8 @@ meta_init(const char *make_mode)
writeMeta = FALSE;
if (strstr(make_mode, "nofilemon"))
useFilemon = FALSE;
- if ((cp = strstr(make_mode, "curdir="))) {
- metaCurdirOk = boolValue(&cp[7]);
+ if ((cp = strstr(make_mode, "curdirok="))) {
+ metaCurdirOk = boolValue(&cp[9]);
}
if (strstr(make_mode, "ignore-cmd"))
metaIgnoreCMDs = TRUE;