[src/trunk]: src/usr.bin/make make(1): rename MAKEFILE_PREFERENCE for consist...

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

details:   https://anonhg.NetBSD.org/src/rev/25817c6831e6
branches:  trunk
changeset: 945690:25817c6831e6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Nov 04 13:22:15 2020 +0000

description:
make(1): rename MAKEFILE_PREFERENCE for consistency

The names of the other special variables are all prefixed with MAKE_.

diffstat:

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

diffs (54 lines):

diff -r f82c81e909c7 -r 25817c6831e6 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Wed Nov 04 13:04:56 2020 +0000
+++ b/usr.bin/make/main.c       Wed Nov 04 13:22:15 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.423 2020/11/04 04:49:32 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.424 2020/11/04 13:22:15 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.423 2020/11/04 04:49:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.424 2020/11/04 13:22:15 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -1272,7 +1272,7 @@
                }
        } else {
                char *p1;
-               (void)Var_Subst("${" MAKEFILE_PREFERENCE "}",
+               (void)Var_Subst("${" MAKE_MAKEFILE_PREFERENCE "}",
                                VAR_CMDLINE, VARE_WANTRES, &p1);
                /* TODO: handle errors */
                (void)str2Lst_Append(opts.makefiles, p1, NULL);
@@ -1395,7 +1395,7 @@
 #ifndef MAKEFILE_PREFERENCE_LIST
 # define MAKEFILE_PREFERENCE_LIST "makefile Makefile"
 #endif
-       Var_Set(MAKEFILE_PREFERENCE, MAKEFILE_PREFERENCE_LIST,
+       Var_Set(MAKE_MAKEFILE_PREFERENCE, MAKEFILE_PREFERENCE_LIST,
                VAR_GLOBAL);
        Var_Set(MAKE_DEPENDFILE, ".depend", VAR_GLOBAL);
 
diff -r f82c81e909c7 -r 25817c6831e6 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Wed Nov 04 13:04:56 2020 +0000
+++ b/usr.bin/make/make.h       Wed Nov 04 13:22:15 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.184 2020/11/04 13:04:56 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.185 2020/11/04 13:22:15 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -475,7 +475,7 @@
 #define        MAKE_EXPORTED   ".MAKE.EXPORTED"   /* variables we export */
 #define        MAKE_MAKEFILES  ".MAKE.MAKEFILES"  /* all makefiles already loaded */
 #define        MAKE_LEVEL      ".MAKE.LEVEL"      /* recursion level */
-#define MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
+#define MAKE_MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
 #define MAKE_DEPENDFILE        ".MAKE.DEPENDFILE" /* .depend */
 #define MAKE_MODE      ".MAKE.MODE"
 #ifndef MAKE_LEVEL_ENV