From f883c0ad24e94c992ed2270ed535651f7febbf8e Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 11 Mar 2016 23:44:56 +0000 Subject: [PATCH] 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 --- include/Makefile | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/include/Makefile b/include/Makefile index 80900efe4d6c..dcf0d6d86a66 100644 --- a/include/Makefile +++ b/include/Makefile @@ -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 -.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