Module Name: src
Committed By: jmmv
Date: Tue Mar 8 07:53:43 UTC 2011
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 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.261 src/share/mk/bsd.prog.mk:1.262
--- src/share/mk/bsd.prog.mk:1.261 Mon Mar 7 19:05:03 2011
+++ src/share/mk/bsd.prog.mk Tue Mar 8 07:53:43 2011
@@ -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
