diff options
| author | benno <benno@FreeBSD.org> | 2013-05-01 09:56:09 +0000 |
|---|---|---|
| committer | benno <benno@FreeBSD.org> | 2013-05-01 09:56:09 +0000 |
| commit | 8398e00dacb289bbf89c2723304e7a7822907bdd (patch) | |
| tree | f53cd2787bb4477f878c0d531876450842405b3b /Makefile.inc1 | |
| parent | 3b9d69d79e9558d9ae6da22cc0b87c36109447d9 (diff) | |
| download | FreeBSD-src-8398e00dacb289bbf89c2723304e7a7822907bdd.zip FreeBSD-src-8398e00dacb289bbf89c2723304e7a7822907bdd.tar.gz | |
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
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 6ea6830..8365e25 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) |
