svn commit: r250143 - head

[Benno Rice]

Author: benno
Date: Wed May  1 09:56:09 2013
New Revision: 250143
URL: http://svnweb.freebsd.org/changeset/base/250143

Log:
  Optimize SUBDIR_OVERRIDE such that SUBDIR isn't automatically defined if
  SUBDIR_OVERRIDE is defined.
  
  PR:		conf/174071
  Submitted by:	Garrett Cooper <yaneurabeya at gmail.com>
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed May  1 09:20:13 2013	(r250142)
+++ head/Makefile.inc1	Wed May  1 09:56:09 2013	(r250143)
@@ -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)