From d419d312bf98d9ee6353ea9a231284b7bb7b7a8e Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 8 Oct 2015 19:19:56 +0000
Subject: MFC r288160:

  Document bsd.progs.mk and add more variables overrides.
---
 share/mk/bsd.README   | 14 ++++++++++++++
 share/mk/bsd.progs.mk |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'share/mk')

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 8121c63..5f0c165 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -251,6 +251,20 @@ PROG_CXX	If defined, the name of the program to build.  Also
 		standard C++ library.  PROG_CXX overrides the value
 		of PROG if PROG is also set.
 
+PROGS		When used with <bsd.progs.mk>, allow building multiple
+PROGS_CXX	PROG and PROGS_CXX in one Makefile.  To define
+		individual variables for each program the VAR.prog
+		syntax should be used.  For example:
+
+		PROGS=		foo bar
+		SRCS.foo=	foo_src.c
+		LDADD.foo=	-lutil
+		SRCS.bar=	bar_src.c
+
+		The supported variables are BINDIR BINGRP BINMODE BINOWN
+		CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD
+		LDFLAGS MAN MLINKS PROGNAME SRCS.
+
 PROGNAME	The name that the above program will be installed as, if
 		different from ${PROG}.
 
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index 8b8d76c..ccac477 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -42,8 +42,10 @@ PROG ?= $t
 
 .if defined(PROG)
 # just one of many
-PROG_OVERRIDE_VARS += BINDIR DPSRCS MAN SRCS
-PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LDFLAGS ${PROG_OVERRIDE_VARS}
+PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN PROGNAME \
+			SRCS
+PROG_VARS +=	CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LINKS \
+		LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
 .if empty(${PROG_OVERRIDE_VARS:M$v})
 .if defined(${v}.${PROG})
-- 
cgit v1.1