From 7aa37f3bfab6c528da3d083290a5d4ad842c71d9 Mon Sep 17 00:00:00 2001
From: kevans <kevans@FreeBSD.org>
Date: Mon, 20 Aug 2018 00:53:38 +0000
Subject: [PATCH] MFC r337696: Use INCS for non-sys/ libnvpair and libzfs_core
 includes

While nothing was wrong with libnvpair.h, libzfs_core.h was only guarded by
MK_CDDL rather than MK_CDDL && MK_ZFS. Rather than ugl'if'ying
include/Makefile to impose the extra restriction, just move the non-sys/
includes into INCS with the respect lib builds.

This has the added bonus of allowing third party packagers to try and split
these libs out of the FreeBSD-runtime package, if they are so inclined.

The sys/ include was left alone- generally userland libraries shouldn't
install kernel headers.
---
 cddl/lib/libnvpair/Makefile   | 1 +
 cddl/lib/libzfs_core/Makefile | 1 +
 include/Makefile              | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 3321e274e6c..892568d579f 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -5,6 +5,7 @@
 
 LIB=	nvpair
 
+INCS=	libnvpair.h
 SRCS=	libnvpair.c \
 	nvpair_alloc_system.c \
 	nvpair_json.c \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index 0df1d0c8920..49866324a04 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -9,6 +9,7 @@
 LIB=	zfs_core
 LIBADD=	nvpair
 
+INCS=	libzfs_core.h
 SRCS=	libzfs_core.c \
 	libzfs_core_compat.c \
 	zfs_ioctl_compat.c
diff --git a/include/Makefile b/include/Makefile
index 6aa5f3fb672..49b3614a10d 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -243,12 +243,6 @@ copies: .PHONY .META
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
 	    ${DESTDIR}${INCLUDEDIR}/teken
 .if ${MK_CDDL} != "no"
-	cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libzfs_core/common; \
-	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \
-	    ${DESTDIR}${INCLUDEDIR}
-	cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libnvpair; \
-	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \
-	    ${DESTDIR}${INCLUDEDIR}
 	cd ${.CURDIR}/../sys/cddl/contrib/opensolaris/uts/common/sys; \
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
 	    ${DESTDIR}${INCLUDEDIR}/sys
-- 
2.45.0