summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2000-07-31 21:01:41 +0000
committerMarc Espie <espie@cvs.openbsd.org>2000-07-31 21:01:41 +0000
commit1313800d4c0dcef4e8df99ad06fc4d328406d5a8 (patch)
tree167ba1ef5e94c20000d705e190605b4b374765a1
parentc3b8e12dc3b77161ddf816dd1c1b1712c9c7bb13 (diff)
POSIX rules: pass variables set on the command line to submakes through
MAKEFLAGS
-rw-r--r--usr.bin/make/main.c6
-rw-r--r--usr.bin/make/make.14
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index d089cb3bf4a..4f196c87764 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.39 2000/07/18 20:17:20 espie Exp $ */
+/* $OpenBSD: main.c,v 1.40 2000/07/31 21:01:40 espie Exp $ */
/* $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $ */
/*
@@ -49,7 +49,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.39 2000/07/18 20:17:20 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.40 2000/07/31 21:01:40 espie Exp $";
#endif
#endif /* not lint */
@@ -679,7 +679,7 @@ main(argc, argv)
MainParseArgs(argc, argv);
-#ifdef NotYet
+#ifdef POSIX
Var_AddCmdline(MAKEFLAGS);
#endif
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 6dd274da250..22112028760 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: make.1,v 1.35 2000/07/06 03:43:35 aaron Exp $
+.\" $OpenBSD: make.1,v 1.36 2000/07/31 21:01:40 espie Exp $
.\" $NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -508,7 +508,7 @@ Its contents are stored in
.Nm make Ns 's
.Va .MAKEFLAGS
variable.
-Anything specified on
+Any flag or variable setting specified on
.Nm make Ns 's
command line is appended to the
.Va .MAKEFLAGS