CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:    src
Committed By:   sjg
Date:           Thu Feb 18 20:33:41 UTC 2016

Modified Files:
        src/usr.bin/make: Makefile meta.c

Log Message:
Adapt to changed Var_Subst()


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/make/Makefile
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/make/meta.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/Makefile
diff -u src/usr.bin/make/Makefile:1.58 src/usr.bin/make/Makefile:1.59
--- src/usr.bin/make/Makefile:1.58	Wed Jun 17 17:43:23 2015
+++ src/usr.bin/make/Makefile	Thu Feb 18 20:33:40 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.58 2015/06/17 17:43:23 christos Exp $
+#	$NetBSD: Makefile,v 1.59 2016/02/18 20:33:40 sjg Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
 PROG=	make
@@ -13,8 +13,7 @@ SRCS+=	lstAppend.c lstAtEnd.c lstAtFront
 	lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c
 SRCS += lstPrev.c
 
-# let people experiment for a bit
-USE_META ?= no
+USE_META ?= yes
 .if ${USE_META:tl} != "no"
 SRCS+=	meta.c
 CPPFLAGS+= -DUSE_META

Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.46 src/usr.bin/make/meta.c:1.47
--- src/usr.bin/make/meta.c:1.46	Thu Feb 18 05:40:50 2016
+++ src/usr.bin/make/meta.c	Thu Feb 18 20:33:40 2016
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.46 2016/02/18 05:40:50 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.47 2016/02/18 20:33:40 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -322,7 +322,7 @@ is_submake(void *cmdp, void *gnp)
     }
     cp = strchr(cmd, '$');
     if ((cp)) {
-	mp = Var_Subst(NULL, cmd, gn, FALSE, TRUE, FALSE);
+	mp = Var_Subst(NULL, cmd, gn, VARF_WANTRES);
 	cmd = mp;
     }
     cp2 = strstr(cmd, p_make);
@@ -364,7 +364,7 @@ printCMD(void *cmdp, void *mfpp)
     char *cp = NULL;
 
     if (strchr(cmd, '$')) {
-	cmd = cp = Var_Subst(NULL, cmd, mfp->gn, FALSE, TRUE, FALSE);
+	cmd = cp = Var_Subst(NULL, cmd, mfp->gn, VARF_WANTRES);
     }
     fprintf(mfp->fp, "CMD %s\n", cmd);
     free(cp);
@@ -458,7 +458,7 @@ meta_create(BuildMon *pbm, GNode *gn)
 	char *mp;
 
 	/* Describe the target we are building */
-	mp = Var_Subst(NULL, "${" MAKE_META_PREFIX "}", gn, FALSE, TRUE, FALSE);
+	mp = Var_Subst(NULL, "${" MAKE_META_PREFIX "}", gn, VARF_WANTRES);
 	if (*mp)
 	    fprintf(stdout, "%s\n", mp);
 	free(mp);
@@ -601,7 +601,7 @@ meta_mode_init(const char *make_mode)
      */
     metaBailiwick = Lst_Init(FALSE);
     cp = Var_Subst(NULL, "${.MAKE.META.BAILIWICK:O:u:tA}", VAR_GLOBAL,
-		   FALSE, TRUE, FALSE);
+		   VARF_WANTRES);
     if (cp) {
 	str2Lst_Append(metaBailiwick, cp, NULL);
     }
@@ -613,7 +613,7 @@ meta_mode_init(const char *make_mode)
 	       "/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);
+		   VARF_WANTRES);
     if (cp) {
 	str2Lst_Append(metaIgnorePaths, cp, NULL);
     }
@@ -725,7 +725,7 @@ meta_job_output(Job *job, char *cp, cons
 		char *cp2;
 
 		meta_prefix = Var_Subst(NULL, "${" MAKE_META_PREFIX "}",
-					VAR_GLOBAL, FALSE, TRUE, FALSE);
+					VAR_GLOBAL, VARF_WANTRES);
 		if ((cp2 = strchr(meta_prefix, '$')))
 		    meta_prefix_len = cp2 - meta_prefix;
 		else
@@ -1309,7 +1309,7 @@ meta_oodate(GNode *gn, Boolean oodate)
 			if (DEBUG(META))
 			    fprintf(debug_file, "%s: %d: cannot compare command using .OODATE\n", fname, lineno);
 		    }
-		    cmd = Var_Subst(NULL, cmd, gn, TRUE, TRUE, FALSE);
+		    cmd = Var_Subst(NULL, cmd, gn, VARF_WANTRES|VARF_UNDEFERR);
 
 		    if ((cp = strchr(cmd, '\n'))) {
 			int n;