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
This commit is contained in:
+2
-22
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user