summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>2000-06-06 09:00:49 +0000
committermycroft <mycroft@NetBSD.org>2000-06-06 09:00:49 +0000
commit6bf47769cb4c3a1000ea06f7bb41d2e7851d92f0 (patch)
tree1cee8422abd8c4f6f78059f90f89c76c6ebab213 /usr.bin/make
parent9994843c598f47ac78d9328aea8513cd05ad0624 (diff)
Do some evil with VAR_KEEP to make it happier. This seems... wrong.
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/var.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 117fe9ce88e..c3fd141c8c0 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.49 2000/06/06 08:44:57 mycroft Exp $ */
+/* $NetBSD: var.c,v 1.50 2000/06/06 09:00:49 mycroft Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: var.c,v 1.49 2000/06/06 08:44:57 mycroft Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.50 2000/06/06 09:00:49 mycroft Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.49 2000/06/06 08:44:57 mycroft Exp $");
+__RCSID("$NetBSD: var.c,v 1.50 2000/06/06 09:00:49 mycroft Exp $");
#endif
#endif /* not lint */
#endif
@@ -2052,12 +2052,12 @@ Var_Parse (str, ctxt, err, lengthPtr, freePtr)
wantit = ((v->flags & VAR_JUNK) != 0);
else
wantit = ((v->flags & VAR_JUNK) == 0);
+ if ((v->flags & VAR_JUNK) != 0)
+ v->flags |= VAR_KEEP;
if (wantit) {
newStr = (char *)Buf_GetAll(buf, (int *)NULL);
Buf_Destroy(buf, FALSE);
} else {
- if ((v->flags & VAR_JUNK) != 0)
- v->flags |= VAR_KEEP;
newStr = str;
Buf_Destroy(buf, TRUE);
}