From d5f4dd1be718e5208ada6be812e7cf937836a4ea Mon Sep 17 00:00:00 2001 From: Mariusz Zaborski Date: Thu, 4 Apr 2019 04:14:20 +0000 Subject: [PATCH] Add cap_fileargs.h to -legacy if needed. Reviewed by: arichardson Differential Revision: https://reviews.freebsd.org/D19685 --- tools/build/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index cce0850d92d..664f7644c62 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -4,10 +4,11 @@ LIB= egacy SRC= -INCSGROUPS= INCS SYSINCS +INCSGROUPS= INCS SYSINCS CASPERINC INCS= SYSINCSDIR= ${INCLUDEDIR}/sys +CASPERINCDIR= ${INCLUDEDIR}/casper BOOTSTRAPPING?= 0 @@ -58,6 +59,10 @@ INCS+= capsicum_helpers.h INCS+= libcasper.h .endif +.if !exists(/usr/include/casper/cap_fileargs.h) +CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h +.endif + .if empty(SRCS) SRCS= dummy.c .endif @@ -116,7 +121,7 @@ host-symlinks: # and cross-tools stages. We do this here using mkdir since mtree may not exist # yet (this happens if we are crossbuilding from Linux/Mac). installdirs: -.for _dir in bin usr/lib usr/include lib/geom lib/casper +.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper mkdir -p "${DESTDIR}/${_dir}" .endfor # Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a