Module Name: src
Committed By: matthias
Date: Mon Mar 14 07:42:16 UTC 2016
Modified Files:
src/usr.bin/make: make.1 suff.c
Log Message:
make $@ an alias for $! in archive member rules (compatibility with
other makes).
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/usr.bin/make/make.1
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/make/suff.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.254 src/usr.bin/make/make.1:1.255
--- src/usr.bin/make/make.1:1.254 Sat Feb 20 01:43:28 2016
+++ src/usr.bin/make/make.1 Mon Mar 14 07:42:15 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.254 2016/02/20 01:43:28 wiz Exp $
+.\" $NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -685,6 +685,9 @@ or it will not be recognized.
.It Va .TARGET
The name of the target; also known as
.Ql Va @ .
+For compatibility with other makes this is an alias for
+.Ic Va .ARCHIVE
+in archive member rules.
.El
.Pp
The shorter forms
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.78 src/usr.bin/make/suff.c:1.79
--- src/usr.bin/make/suff.c:1.78 Thu Feb 18 18:29:14 2016
+++ src/usr.bin/make/suff.c Mon Mar 14 07:42:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $ */
+/* $NetBSD: suff.c,v 1.79 2016/03/14 07:42:15 matthias Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.79 2016/03/14 07:42:15 matthias Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $");
+__RCSID("$NetBSD: suff.c,v 1.79 2016/03/14 07:42:15 matthias Exp $");
#endif
#endif /* not lint */
#endif
@@ -1955,6 +1955,11 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
Var_Set(MEMBER, name, gn, 0);
Var_Set(ARCHIVE, gn->name, gn, 0);
+ /*
+ * Set $@ for compatibility with other makes
+ */
+ Var_Set(TARGET, gn->name, gn, 0);
+
if (ms != NULL) {
/*
* Member has a known suffix, so look for a transformation rule from
