Module Name: src
Committed By: rillig
Date: Fri Oct 30 06:59:12 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): rename SAVE_DOLLARS to follow the naming conventions
To generate a diff of this commit:
cvs rdiff -u -r1.592 -r1.593 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.592 src/usr.bin/make/var.c:1.593
--- src/usr.bin/make/var.c:1.592 Fri Oct 30 06:44:57 2020
+++ src/usr.bin/make/var.c Fri Oct 30 06:59:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.592 2020/10/30 06:44:57 rillig Exp $ */
+/* $NetBSD: var.c,v 1.593 2020/10/30 06:59:12 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.592 2020/10/30 06:44:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.593 2020/10/30 06:59:12 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -162,13 +162,14 @@ static char varUndefined[] = "";
static char emptyString[] = "";
/*
- * Traditionally we consume $$ during := like any other expansion.
- * Other make's do not.
+ * Traditionally this make consumed $$ during := like any other expansion.
+ * Other make's do not, and this make follows straight since 2016-01-09.
+ *
* This knob allows controlling the behavior.
* FALSE to consume $$ during := assignment.
* TRUE to preserve $$ during := assignment.
*/
-#define SAVE_DOLLARS ".MAKE.SAVE_DOLLARS"
+#define MAKE_SAVE_DOLLARS ".MAKE.SAVE_DOLLARS"
static Boolean save_dollars = TRUE;
/*
@@ -857,7 +858,7 @@ Var_Set_with_flags(const char *name, con
Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL);
}
- if (name[0] == '.' && strcmp(name, SAVE_DOLLARS) == 0)
+ if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0)
save_dollars = s2Boolean(val, save_dollars);
out:
