summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2014-02-15 00:17:17 +0000
committerchristos <christos@NetBSD.org>2014-02-15 00:17:17 +0000
commit6e23cd4e5ebef8a939e7a2b0fcc51328a4036c93 (patch)
treef344e94e5fc8c4f8b30522dbebc67ba952795af3 /usr.bin/make
parent4738258b9c5f8c37fec09adc3995331bb05caee7 (diff)
delete the correct variables on eof
fix typo in comment (from sjg)
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/parse.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 4a808fd2f2c..9fbc5c53c49 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -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 @@ ParseDoInclude(char *line)
* 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 @@ ParseEOF(void)
/* 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;
}