[src/trunk]: src/usr.bin/make Adapt to new Var_Subst prototype

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

details:   https://anonhg.NetBSD.org/src/rev/82caa733cded
branches:  trunk
changeset: 343639:82caa733cded
user:      sjg <sjg%NetBSD.org@localhost>
date:      Thu Feb 18 05:01:39 2016 +0000

description:
Adapt to new Var_Subst prototype

diffstat:

 usr.bin/make/meta.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 6c4a8282ac7b -r 82caa733cded usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Wed Feb 17 20:12:42 2016 +0000
+++ b/usr.bin/make/meta.c       Thu Feb 18 05:01:39 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.44 2016/01/17 17:45:21 christos Exp $ */
+/*      $NetBSD: meta.c,v 1.45 2016/02/18 05:01:39 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -322,7 +322,7 @@
     }
     cp = strchr(cmd, '$');
     if ((cp)) {
-       mp = Var_Subst(NULL, cmd, gn, FALSE, TRUE);
+       mp = Var_Subst(NULL, cmd, gn, FALSE, TRUE, TRUE);
        cmd = mp;
     }
     cp2 = strstr(cmd, p_make);
@@ -364,7 +364,7 @@
     char *cp = NULL;
 
     if (strchr(cmd, '$')) {
-       cmd = cp = Var_Subst(NULL, cmd, mfp->gn, FALSE, TRUE);
+       cmd = cp = Var_Subst(NULL, cmd, mfp->gn, FALSE, TRUE, TRUE);
     }
     fprintf(mfp->fp, "CMD %s\n", cmd);
     free(cp);
@@ -458,7 +458,7 @@
        char *mp;
 
        /* Describe the target we are building */
-       mp = Var_Subst(NULL, "${" MAKE_META_PREFIX "}", gn, FALSE, TRUE);
+       mp = Var_Subst(NULL, "${" MAKE_META_PREFIX "}", gn, FALSE, TRUE, TRUE);
        if (*mp)
            fprintf(stdout, "%s\n", mp);
        free(mp);
@@ -601,7 +601,7 @@
      */
     metaBailiwick = Lst_Init(FALSE);
     cp = Var_Subst(NULL, "${.MAKE.META.BAILIWICK:O:u:tA}", VAR_GLOBAL,
-                  FALSE, TRUE);
+                  FALSE, TRUE, TRUE);
     if (cp) {
        str2Lst_Append(metaBailiwick, cp, NULL);
     }
@@ -613,7 +613,7 @@
               "/dev /etc /proc /tmp /var/run /var/tmp ${TMPDIR}", VAR_GLOBAL);
     cp = Var_Subst(NULL,
                   "${" MAKE_META_IGNORE_PATHS ":O:u:tA}", VAR_GLOBAL,
-                  FALSE, TRUE);
+                  FALSE, TRUE, TRUE);
     if (cp) {
        str2Lst_Append(metaIgnorePaths, cp, NULL);
     }
@@ -725,7 +725,7 @@
                char *cp2;
 
                meta_prefix = Var_Subst(NULL, "${" MAKE_META_PREFIX "}",
-                                       VAR_GLOBAL, FALSE, TRUE);
+                                       VAR_GLOBAL, FALSE, TRUE, TRUE);
                if ((cp2 = strchr(meta_prefix, '$')))
                    meta_prefix_len = cp2 - meta_prefix;
                else
@@ -1309,7 +1309,7 @@
                        if (DEBUG(META))
                            fprintf(debug_file, "%s: %d: cannot compare command using .OODATE\n", fname, lineno);
                    }
-                   cmd = Var_Subst(NULL, cmd, gn, TRUE, TRUE);
+                   cmd = Var_Subst(NULL, cmd, gn, TRUE, TRUE, TRUE);
 
                    if ((cp = strchr(cmd, '\n'))) {
                        int n;