[src/netbsd-1-4]: src/usr.bin/make pullup 1.41->1.42 (christos)

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

details:   https://anonhg.NetBSD.org/src/rev/57c04238fb2b
branches:  netbsd-1-4
changeset: 468822:57c04238fb2b
user:      perry <perry%NetBSD.org@localhost>
date:      Mon Jun 21 16:37:31 1999 +0000

description:
pullup 1.41->1.42 (christos)

diffstat:

 usr.bin/make/parse.c |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 4891e8831eb1 -r 57c04238fb2b usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Mon Jun 21 16:31:30 1999 +0000
+++ b/usr.bin/make/parse.c      Mon Jun 21 16:37:31 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.41 1998/11/17 23:56:23 ross Exp $  */
+/*     $NetBSD: parse.c,v 1.41.2.1 1999/06/21 16:37:31 perry Exp $     */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: parse.c,v 1.41 1998/11/17 23:56:23 ross Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.41.2.1 1999/06/21 16:37:31 perry Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.41 1998/11/17 23:56:23 ross Exp $");
+__RCSID("$NetBSD: parse.c,v 1.41.2.1 1999/06/21 16:37:31 perry Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1520,6 +1520,14 @@
        Boolean   oldOldVars = oldVars;
 
        oldVars = FALSE;
+
+       /*
+        * make sure that we set the variable the first time to nothing
+        * so that it gets substituted!
+        */
+       if (!Var_Exists(line, ctxt))
+           Var_Set(line, "", ctxt);
+
        cp = Var_Subst(NULL, cp, ctxt, FALSE);
        oldVars = oldOldVars;