make(1) claims to ignore the remainder of a conditional once its value

has been determined similar to C. That is, one expects a construction
like,

.if defined(TEST) && (${TEST:L} == "test")

Never to generate an error since the second expression should never be
evaluated when TEST is undefined.

However, this was not the case. The above fails with the current
make(1) if TEST is undefined. This patch fixes the above and many
similar cases.

PR:		bin/34032
Submitted by:	Alan Eldridge <alane@geeksrus.net>
MFC after:	1 week

1 files changed, 1 insertions, 1 deletions

diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index f219831..0b88650 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -2281,7 +2281,7 @@ Var_Parse (str, ctxt, err, lengthPtr, freePtr)
 	    str[*lengthPtr] = '\0';
 	    *freePtr = TRUE;
 	} else {
-	    str = var_Error;
+	    str = err ? var_Error : varNoError;
 	}
     }
     return (str);