diff options
author | Benno Rice <benno@FreeBSD.org> | 2013-05-01 09:56:09 +0000 |
---|---|---|
committer | Benno Rice <benno@FreeBSD.org> | 2013-05-01 09:56:09 +0000 |
commit | f26a777c9e5b23645440df8e92cddf437da36677 (patch) | |
tree | f53cd2787bb4477f878c0d531876450842405b3b /Makefile.inc1 | |
parent | 474dbfb739845d069ee87ad6587b2ceee60bb920 (diff) | |
download | src-f26a777c9e5b23645440df8e92cddf437da36677.tar.gz src-f26a777c9e5b23645440df8e92cddf437da36677.zip |
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
Notes
Notes:
svn path=/head/; revision=250143
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6ea683057f3f..8365e252ee8e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -58,6 +58,9 @@ # use that new version. And the new (dynamically-linked) /bin/sh # will expect to find appropriate libraries in /lib and /libexec. # +.if defined(SUBDIR_OVERRIDE) +SUBDIR= ${SUBDIR_OVERRIDE} +.else SUBDIR= share/info lib libexec SUBDIR+=bin .if ${MK_GAMES} != "no" @@ -96,9 +99,6 @@ SUBDIR+=etc SUBDIR+= ${_DIR} .endif .endfor - -.if defined(SUBDIR_OVERRIDE) -SUBDIR= ${SUBDIR_OVERRIDE} .endif .if defined(NOCLEAN) |