[src/trunk]: src/share/mk Revert previous (revision 1.261): it broke the buil...

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

details:   https://anonhg.NetBSD.org/src/rev/0315357f7f6e
branches:  trunk
changeset: 763011:0315357f7f6e
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Tue Mar 08 07:53:43 2011 +0000

description:
Revert previous (revision 1.261): it broke the build because PROG_CXX is
defined in terms of PROG, so later on we would end up with target duplicates
because both PROG_CXX and PROG were being converted to PROGS_CXX and PROGS.

Did not catch this earlier because the test build I did was not clean and
thus the duplicate targets did not have nasty effects.

diffstat:

 share/mk/bsd.prog.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r d31de098c7d3 -r 0315357f7f6e share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Tue Mar 08 07:44:39 2011 +0000
+++ b/share/mk/bsd.prog.mk      Tue Mar 08 07:53:43 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.261 2011/03/07 19:05:03 jmmv Exp $
+#      $NetBSD: bsd.prog.mk,v 1.262 2011/03/08 07:53:43 jmmv Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -262,8 +262,7 @@
 .if !defined(RUMPPRG)
 .  if defined(PROG_CXX) && !defined(PROGS_CXX)
 PROGS_CXX=     ${PROG_CXX}
-.  endif
-.  if defined(PROG) && !defined(PROGS)
+.  elif defined(PROG) && !defined(PROGS)
 PROGS=         ${PROG}
 .  endif
 .endif