Author: sjg
Date: Mon Apr 22 18:11:29 2013
New Revision: 249770
URL: http://svnweb.freebsd.org/changeset/base/249770
Log:
Pass more variables to bsd.prog.mk and
only append to already defined variables.
Submitted by: Garrett Cooper
Modified:
head/share/mk/bsd.progs.mk
Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk Mon Apr 22 17:55:12 2013 (r249769)
+++ head/share/mk/bsd.progs.mk Mon Apr 22 18:11:29 2013 (r249770)
@@ -36,9 +36,11 @@ PROG ?= $t
.if defined(PROG)
# just one of many
-PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
+PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
.for v in ${PROG_VARS:O:u}
+.if defined(${v}.${PROG})
$v += ${${v}_${PROG}:U${${v}.${PROG}}}
+.endif
.endfor
# for meta mode, there can be only one!
@@ -64,7 +66,8 @@ UPDATE_DEPENDFILE = NO
.include <${.PARSEFILE:S,progs,prog,}>
.ifndef PROG
-PROGS_TARGETS += clean
+# tell progs.mk we might want to install things
+PROGS_TARGETS+= cleandepend cleandir cleanobj depend install
.for p in ${PROGS}
.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
