Module Name: src
Committed By: sjg
Date: Tue Jul 9 18:13:14 UTC 2013
Modified Files:
src/usr.bin/make: main.c
Log Message:
Set .MAKE.LEVEL.ENV to the name of the env variable used to communicate
the recursion level to sub-makes.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.216 src/usr.bin/make/main.c:1.217
--- src/usr.bin/make/main.c:1.216 Sat Jul 6 18:19:17 2013
+++ src/usr.bin/make/main.c Tue Jul 9 18:13:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $ */
+/* $NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -932,6 +932,8 @@ main(int argc, char **argv)
Var_Set(MAKEOVERRIDES, "", VAR_GLOBAL, 0);
Var_Set("MFLAGS", "", VAR_GLOBAL, 0);
Var_Set(".ALLTARGETS", "", VAR_GLOBAL, 0);
+ /* some makefiles need to know this */
+ Var_Set(MAKE_LEVEL ".ENV", MAKE_LEVEL_ENV, VAR_GLOBAL, 0);
/*
* Set some other useful macros