svn commit: r338080 - in stable/11: cddl/lib/libnvpair cddl/lib/libzfs_core include

[Kyle Evans]

Author: kevans
Date: Mon Aug 20 00:53:38 2018
New Revision: 338080
URL: https://svnweb.freebsd.org/changeset/base/338080

Log:
  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.

Modified:
  stable/11/cddl/lib/libnvpair/Makefile
  stable/11/cddl/lib/libzfs_core/Makefile
  stable/11/include/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/lib/libnvpair/Makefile
==============================================================================
--- stable/11/cddl/lib/libnvpair/Makefile	Mon Aug 20 00:51:19 2018	(r338079)
+++ stable/11/cddl/lib/libnvpair/Makefile	Mon Aug 20 00:53:38 2018	(r338080)
@@ -5,6 +5,7 @@
 
 LIB=	nvpair
 
+INCS=	libnvpair.h
 SRCS=	libnvpair.c \
 	nvpair_alloc_system.c \
 	nvpair_json.c \

Modified: stable/11/cddl/lib/libzfs_core/Makefile
==============================================================================
--- stable/11/cddl/lib/libzfs_core/Makefile	Mon Aug 20 00:51:19 2018	(r338079)
+++ stable/11/cddl/lib/libzfs_core/Makefile	Mon Aug 20 00:53:38 2018	(r338080)
@@ -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

Modified: stable/11/include/Makefile
==============================================================================
--- stable/11/include/Makefile	Mon Aug 20 00:51:19 2018	(r338079)
+++ stable/11/include/Makefile	Mon Aug 20 00:53:38 2018	(r338080)
@@ -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