[src/trunk]: src/usr.bin/make delete the correct variables on eof

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

details:   https://anonhg.NetBSD.org/src/rev/7e4f0e60cb04
branches:  trunk
changeset: 793465:7e4f0e60cb04
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Feb 15 00:17:17 2014 +0000

description:
delete the correct variables on eof
fix typo in comment (from sjg)

diffstat:

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

diffs (45 lines):

diff -r fd08ccc29738 -r 7e4f0e60cb04 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Fri Feb 14 20:43:34 2014 +0000
+++ b/usr.bin/make/parse.c      Sat Feb 15 00:17:17 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $     */
+/*     $NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $     */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos 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.193 2014/01/10 16:12:52 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2236,7 +2236,7 @@
  * Side Effects:
  *     The .INCLUDEDFROMFILE variable is overwritten by the contents
  *     of .PARSEFILE and the .INCLUDEDFROMDIR variable is overwriten
- *     but the contents of .PARSEDIR
+ *     by the contents of .PARSEDIR
  *---------------------------------------------------------------------
  */
 static void
@@ -2569,7 +2569,8 @@
        /* We've run out of input */
        Var_Delete(".PARSEDIR", VAR_GLOBAL);
        Var_Delete(".PARSEFILE", VAR_GLOBAL);
-       Var_Delete(".INCLUDED_FROM", VAR_GLOBAL);
+       Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL);
+       Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL);
        return DONE;
     }