diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-17 15:23:38 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-17 15:23:38 -0300 |
| commit | 75cd8d40056c799f03b759475d9bfd10ba266a6c (patch) | |
| tree | 60433235501684bffeab90e65139a8285fcf46a9 /share | |
| parent | 99990a0d149f0eae805aa1f49d4a61be30c3b000 (diff) | |
| parent | ad413762f28e3be343987e707b9cf4f10f963693 (diff) | |
| download | FreeBSD-src-75cd8d40056c799f03b759475d9bfd10ba266a6c.zip FreeBSD-src-75cd8d40056c799f03b759475d9bfd10ba266a6c.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.README | 1 | ||||
| -rw-r--r-- | share/mk/bsd.progs.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 6872a6b..df973d5 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -272,6 +272,7 @@ PROGS_CXX PROG and PROGS_CXX in one Makefile. To define - DEBUG_FLAGS - DPADD - DPSRCS + - INTERNALPROG (no installation) - LDADD - LDFLAGS - LINKS diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 69cb1bf..4bf5324 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -35,8 +35,8 @@ UPDATE_DEPENDFILE_PROG?= no # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ PROGNAME SRCS STRIP WARNS -PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD LDADD LIBADD LINKS \ - LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} +PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \ + LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v}) .if defined(${v}.${PROG}) |
