[src/trunk]: src/usr.bin/make make(1): revert unintended change from previous...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2efc45fa4805
branches:  trunk
changeset: 941928:2efc45fa4805
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 01 18:48:13 2020 +0000

description:
make(1): revert unintended change from previous commit

diffstat:

 usr.bin/make/var.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 22d38432d2a9 -r 2efc45fa4805 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Nov 01 18:45:49 2020 +0000
+++ b/usr.bin/make/var.c        Sun Nov 01 18:48:13 2020 +0000
@@ -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 @@
     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;
        }