Module Name: src
Committed By: sjg
Date: Sun Mar 27 19:47:46 UTC 2011
Modified Files:
src/usr.bin/make: make.1 meta.c
Log Message:
Use curdirOk as the token
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/make.1
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/meta.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.184 src/usr.bin/make/make.1:1.185
--- src/usr.bin/make/make.1:1.184 Sun Mar 27 19:39:21 2011
+++ src/usr.bin/make/make.1 Sun Mar 27 19:47:46 2011
@@ -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 @@
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
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.12 src/usr.bin/make/meta.c:1.13
--- src/usr.bin/make/meta.c:1.12 Sun Mar 27 19:39:21 2011
+++ src/usr.bin/make/meta.c Sun Mar 27 19:47:46 2011
@@ -550,8 +550,8 @@
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;
