Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Apr 2019 04:14:20 +0000 (UTC)
From:      Mariusz Zaborski <oshogbo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r345870 - head/tools/build
Message-ID:  <201904040414.x344EKVA015740@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oshogbo
Date: Thu Apr  4 04:14:20 2019
New Revision: 345870
URL: https://svnweb.freebsd.org/changeset/base/345870

Log:
  Add cap_fileargs.h to -legacy if needed.
  
  Reviewed by:	arichardson
  Differential Revision:	https://reviews.freebsd.org/D19685

Modified:
  head/tools/build/Makefile

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Thu Apr  4 02:08:36 2019	(r345869)
+++ head/tools/build/Makefile	Thu Apr  4 04:14:20 2019	(r345870)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904040414.x344EKVA015740>