[src/trunk]: src/usr.bin/make make: inline macro for variable name

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

details:   https://anonhg.NetBSD.org/src/rev/a00be4d7ba9d
branches:  trunk
changeset: 373127:a00be4d7ba9d
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Jan 19 21:33:06 2023 +0000

description:
make: inline macro for variable name

This fixes the inconsistency of using the macro name in one place and
its value in another place (since 2010).

No binary change.

diffstat:

 usr.bin/make/main.c |  6 +++---
 usr.bin/make/make.h |  3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 965aac25321c -r a00be4d7ba9d usr.bin/make/main.c
--- a/usr.bin/make/main.c       Thu Jan 19 19:55:27 2023 +0000
+++ b/usr.bin/make/main.c       Thu Jan 19 21:33:06 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.586 2023/01/01 16:46:26 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.587 2023/01/19 21:33:06 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.586 2023/01/01 16:46:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.587 2023/01/19 21:33:06 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -1357,7 +1357,7 @@
 # define MAKEFILE_PREFERENCE_LIST "makefile Makefile"
 #endif
        Global_Set(MAKE_MAKEFILE_PREFERENCE, MAKEFILE_PREFERENCE_LIST);
-       Global_Set(MAKE_DEPENDFILE, ".depend");
+       Global_Set(".MAKE.DEPENDFILE", ".depend");
 
        CmdOpts_Init();
        allPrecious = false;    /* Remove targets when interrupted */
diff -r 965aac25321c -r a00be4d7ba9d usr.bin/make/make.h
--- a/usr.bin/make/make.h       Thu Jan 19 19:55:27 2023 +0000
+++ b/usr.bin/make/make.h       Thu Jan 19 21:33:06 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.308 2022/10/10 21:17:25 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.309 2023/01/19 21:33:06 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -616,7 +616,6 @@
 #define MAKE_MAKEFILES ".MAKE.MAKEFILES"       /* all loaded makefiles */
 #define MAKE_LEVEL     ".MAKE.LEVEL"           /* recursion level */
 #define MAKE_MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
-#define MAKE_DEPENDFILE        ".MAKE.DEPENDFILE"      /* .depend */
 #define MAKE_MODE      ".MAKE.MODE"
 #ifndef MAKE_LEVEL_ENV
 # define MAKE_LEVEL_ENV        "MAKELEVEL"