diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-14 11:12:41 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-14 11:12:41 -0200 |
| commit | 6edad5be89050ac3cfa5512ddceca99affe9ad8a (patch) | |
| tree | 2c88bc0aac442001b8a020f1b41cfce5c79b4959 /contrib/bmake/suff.c | |
| parent | 1b7c02947f339bceaede5ea0a8aa91cb00b44eb3 (diff) | |
| parent | 98e6718d915fa5a645555a7bf1f41f75c5b53107 (diff) | |
| download | FreeBSD-src-6edad5be89050ac3cfa5512ddceca99affe9ad8a.zip FreeBSD-src-6edad5be89050ac3cfa5512ddceca99affe9ad8a.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/bmake/suff.c')
| -rw-r--r-- | contrib/bmake/suff.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bmake/suff.c b/contrib/bmake/suff.c index d4f0eb1..15a3cc8 100644 --- a/contrib/bmake/suff.c +++ b/contrib/bmake/suff.c @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.70 2013/05/18 13:13:34 sjg Exp $ */ +/* $NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.70 2013/05/18 13:13:34 sjg Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.70 2013/05/18 13:13:34 sjg Exp $"); +__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1543,7 +1543,7 @@ SuffExpandChildren(LstNode cln, GNode *pgn) if (DEBUG(SUFF)) { fprintf(debug_file, "Expanding \"%s\"...", cgn->name); } - cp = Var_Subst(NULL, cgn->name, pgn, TRUE); + cp = Var_Subst(NULL, cgn->name, pgn, TRUE, TRUE); if (cp != NULL) { Lst members = Lst_Init(FALSE); @@ -1596,7 +1596,7 @@ SuffExpandChildren(LstNode cln, GNode *pgn) int len; void *freeIt; - junk = Var_Parse(cp, pgn, TRUE, &len, &freeIt); + junk = Var_Parse(cp, pgn, TRUE, TRUE, &len, &freeIt); if (junk != var_Error) { cp += len - 1; } |
