On Mon, Mar 07, 2011 at 07:05:04PM +0000, Julio Merino wrote: > Module Name: src > Committed By: jmmv > Date: Mon Mar 7 19:05:04 UTC 2011 > > Modified Files: > src/share/mk: bsd.prog.mk > > Log Message: > Always convert PROG to its plural form independently of whether PROG_CXX > is defined or not. From Garrett Cooper in private mail. > > > To generate a diff of this commit: > cvs rdiff -u -r1.260 -r1.261 src/share/mk/bsd.prog.mk > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. >
> Modified files: > > Index: src/share/mk/bsd.prog.mk > diff -u src/share/mk/bsd.prog.mk:1.260 src/share/mk/bsd.prog.mk:1.261 > --- src/share/mk/bsd.prog.mk:1.260 Sun Feb 20 20:16:01 2011 > +++ src/share/mk/bsd.prog.mk Mon Mar 7 19:05:03 2011 > @@ -1,4 +1,4 @@ > -# $NetBSD: bsd.prog.mk,v 1.260 2011/02/20 20:16:01 jmmv Exp $ > +# $NetBSD: bsd.prog.mk,v 1.261 2011/03/07 19:05:03 jmmv Exp $ > # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 > > .ifndef HOSTPROG > @@ -262,7 +262,8 @@ > .if !defined(RUMPPRG) > . if defined(PROG_CXX) && !defined(PROGS_CXX) > PROGS_CXX= ${PROG_CXX} > -. elif defined(PROG) && !defined(PROGS) > +. endif > +. if defined(PROG) && !defined(PROGS) > PROGS= ${PROG} > . endif > .endif > Now if PROG_CXX is defined, both PROGS and PROGS_CXX refer to PROG_CXX. Thus the ".for _P in ${PROGS} ${PROGS_CXX}" loop runs twice.