From: kn <kn@openbsd.org>
Date: Tue, 17 Jan 2023 13:03:22 +0000 (+0000)
Subject: Arguments may contain more than one variable assignment
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c842d149417bcd23af20466c4da687d722885f62;p=openbsd

Arguments may contain more than one variable assignment

`make FOO=1 BAR=2 ...' works as expected and lots of things wouldn't work
if make only accepted a single assignment, as currently documented.

Fix SYNOPSIS and usage to match reality and POSIX spec (thanks jmc).

OK jmc
---

diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 645275d3985..64ea5d27509 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.128 2022/12/04 23:50:48 cheloha Exp $ */
+/*	$OpenBSD: main.c,v 1.129 2023/01/17 13:03:22 kn Exp $ */
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -891,7 +891,7 @@ usage()
 	(void)fprintf(stderr,
 "usage: make [-BeiknpqrSst] [-C directory] [-D variable] [-d flags] [-f mk]\n\
 	    [-I directory] [-j max_processes] [-m directory] [-V variable]\n\
-	    [NAME=value] [target ...]\n");
+	    [NAME=value ...] [target ...]\n");
 	exit(2);
 }
 
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index b297ab037dc..37e3ef289d5 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.138 2022/12/28 13:00:57 jsg Exp $
+.\"	$OpenBSD: make.1,v 1.139 2023/01/17 13:03:22 kn Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: December 28 2022 $
+.Dd $Mdocdate: January 17 2023 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Op Fl j Ar max_processes
 .Op Fl m Ar directory
 .Op Fl V Ar variable
-.Op Ar NAME Ns = Ns Ar value
+.Op Ar NAME Ns = Ns Ar value ...
 .Bk -words
 .Op Ar target ...
 .Ek