[src/trunk]: src/usr.bin/make If using gmake's MAKELEVEL; use it the same way

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

details:   https://anonhg.NetBSD.org/src/rev/bec724660650
branches:  trunk
changeset: 787835:bec724660650
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sat Jul 06 18:19:17 2013 +0000

description:
If using gmake's MAKELEVEL; use it the same way

diffstat:

 usr.bin/make/main.c |   8 ++++----
 usr.bin/make/var.c  |  17 +++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diffs (80 lines):

diff -r 33e2efa979ce -r bec724660650 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Jul 06 14:38:54 2013 +0000
+++ b/usr.bin/make/main.c       Sat Jul 06 18:19:17 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.215 2013/06/29 15:19:32 christos Exp $      */
+/*     $NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.215 2013/06/29 15:19:32 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.215 2013/06/29 15:19:32 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -940,7 +940,7 @@
            char tmp[64], *ep;
 
            snprintf(tmp, sizeof(tmp), "%d",
-               (ep = getenv(MAKE_LEVEL_ENV)) ? atoi(ep) + 1 : 0);
+               ((ep = getenv(MAKE_LEVEL_ENV)) && *ep) ? atoi(ep) : 0);
            Var_Set(MAKE_LEVEL, tmp, VAR_GLOBAL, 0);
            snprintf(tmp, sizeof(tmp), "%u", myPid);
            Var_Set(".MAKE.PID", tmp, VAR_GLOBAL, 0);
diff -r 33e2efa979ce -r bec724660650 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sat Jul 06 14:38:54 2013 +0000
+++ b/usr.bin/make/var.c        Sat Jul 06 18:19:17 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.179 2013/06/18 20:06:09 sjg Exp $    */
+/*     $NetBSD: var.c,v 1.180 2013/07/06 18:19:17 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.179 2013/06/18 20:06:09 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.180 2013/07/06 18:19:17 sjg 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.179 2013/06/18 20:06:09 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.180 2013/07/06 18:19:17 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -960,9 +960,14 @@
      * We allow the makefiles to update .MAKE.LEVEL and ensure
      * children see a correctly incremented value.
      */
-    if (ctxt == VAR_GLOBAL && strcmp(MAKE_LEVEL, name) == 0)
-       setenv(MAKE_LEVEL_ENV, val, 1);
-       
+    if (ctxt == VAR_GLOBAL && strcmp(MAKE_LEVEL, name) == 0) {
+       char tmp[64];
+       int level;
+
+       level = atoi(val);
+       snprintf(tmp, sizeof(tmp), "%u", level + 1);
+       setenv(MAKE_LEVEL_ENV, tmp, 1);
+    }
        
  out:
     if (expanded_name != NULL)