diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:44:56 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:44:56 +0000 |
| commit | 3e01f13c50249aea2a9354223189824aa173a2f4 (patch) | |
| tree | f1450ff4961f923e522e399d62ffeb0b0aae925e /include | |
| parent | 24b7e3c54feda651e335ff8aacc2cbd68003ed76 (diff) | |
| download | FreeBSD-src-3e01f13c50249aea2a9354223189824aa173a2f4.zip FreeBSD-src-3e01f13c50249aea2a9354223189824aa173a2f4.tar.gz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/include/Makefile b/include/Makefile index 80900ef..dcf0d6d 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 <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 |
