Module Name: src
Committed By: rillig
Date: Sun Nov 1 18:48:13 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): revert unintended change from previous commit
To generate a diff of this commit:
cvs rdiff -u -r1.636 -r1.637 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.636 src/usr.bin/make/var.c:1.637
--- src/usr.bin/make/var.c:1.636 Sun Nov 1 18:45:49 2020
+++ src/usr.bin/make/var.c Sun Nov 1 18:48:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $ */
+/* $NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2373,7 +2373,8 @@ ApplyModifier_Match(const char **pp, App
for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) {
if (*p == '\\' &&
(p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) {
- copy = TRUE;
+ if (!needSubst)
+ copy = TRUE;
p++;
continue;
}
