Author: bdrewery
Date: Fri Mar 11 23:44:59 2016
New Revision: 296692
URL: https://svnweb.freebsd.org/changeset/base/296692

Log:
  Remove out-of-place make(buildincludes) check.
  
  This came in r239572 for META_MODE handling but it doesn't make sense
  since the staging is always done in make(all); make(buildincludes)
  is never actually ran in the META_MODE build.
  
  Reported by:  bapt
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.files.mk

Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk  Fri Mar 11 23:44:56 2016        (r296691)
+++ head/share/mk/bsd.files.mk  Fri Mar 11 23:44:59 2016        (r296692)
@@ -30,9 +30,7 @@ ${group}OWN?= ${SHAREOWN}
 ${group}GRP?=  ${SHAREGRP}
 ${group}MODE?= ${SHAREMODE}
 ${group}DIR?=  ${BINDIR}
-.if !make(buildincludes)
 STAGE_SETS+=   ${group}
-.endif
 STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
 
 _${group}FILES=
@@ -49,9 +47,7 @@ ${group}NAME_${file:T}?=      ${${group}NAME}
 .else
 ${group}NAME_${file:T}?=       ${file:T}
 .endif
-.if !make(buildincludes)
 STAGE_AS_SETS+=        ${file:T}
-.endif
 STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
 # XXX {group}OWN,GRP,MODE
 STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to