From owner-svn-src-all@freebsd.org  Fri Mar 11 23:44:57 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A505AACD049;
 Fri, 11 Mar 2016 23:44:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 762DE6B4;
 Fri, 11 Mar 2016 23:44:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BNiu0p010405;
 Fri, 11 Mar 2016 23:44:56 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BNiuab010404;
 Fri, 11 Mar 2016 23:44:56 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603112344.u2BNiuab010404@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 11 Mar 2016 23:44:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296691 - head/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2016 23:44:57 -0000

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

Log:
  DIRDEPS_BUILD: None of this is needed anymore.
  
  This file is using stage-install, so all of the .dirdep files
  are properly handled.  The cookie handling also properly
  handles rebuilds with .meta files.  DESTDIR from bsd.sys.mk is also
  respected for staging.  This logic came in r239572.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/include/Makefile

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Fri Mar 11 23:44:27 2016	(r296690)
+++ head/include/Makefile	Fri Mar 11 23:44:56 2016	(r296691)
@@ -128,31 +128,11 @@ _MARCHS=	${MACHINE_CPUARCH}
 _MARCHS+=	x86
 .endif
 
-.if ${MK_STAGING} == "yes"
-# tell bsd.incs.mk that we have it covered
-NO_STAGE_INCLUDES=
-META_COOKIES+=	stage_prep stage_include compat copies symlinks
-.endif
+META_COOKIES+=	compat copies symlinks
+stage_includes: ${SHARED}
 
 .include <bsd.prog.mk>
 
-.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
-.if make(all)
-DESTDIR= ${STAGE_OBJTOP}
-
-all:	stage_include
-installincludes: buildincludes
-buildincludes: stage_prep
-
-stage_prep:
-	@mkdir -p ${DESTDIR}${INCLUDEDIR}
-	@touch $@
-
-stage_include: .dirdep installincludes
-	@touch $@
-.endif
-.endif
-
 installincludes: ${SHARED}
 ${SHARED}: compat