Optimize SUBDIR_OVERRIDE such that SUBDIR isn't automatically defined if

SUBDIR_OVERRIDE is defined.

PR:		conf/174071
Submitted by:	Garrett Cooper <yaneurabeya@gmail.com>
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Benno Rice 2013-05-01 09:56:09 +00:00
parent 474dbfb739
commit f26a777c9e

View File

@ -58,6 +58,9 @@
# use that new version. And the new (dynamically-linked) /bin/sh # use that new version. And the new (dynamically-linked) /bin/sh
# will expect to find appropriate libraries in /lib and /libexec. # will expect to find appropriate libraries in /lib and /libexec.
# #
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
SUBDIR= share/info lib libexec SUBDIR= share/info lib libexec
SUBDIR+=bin SUBDIR+=bin
.if ${MK_GAMES} != "no" .if ${MK_GAMES} != "no"
@ -96,9 +99,6 @@ SUBDIR+=etc
SUBDIR+= ${_DIR} SUBDIR+= ${_DIR}
.endif .endif
.endfor .endfor
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.endif .endif
.if defined(NOCLEAN) .if defined(NOCLEAN)