svn commit: r296691 - head/include

[Bryan Drewery]

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