svn commit: r337699 - in head: cddl/lib/libbe sbin/bectl

[Kyle Evans]

Author: kevans
Date: Mon Aug 13 05:01:19 2018
New Revision: 337699
URL: https://svnweb.freebsd.org/changeset/base/337699

Log:
  libbe(3)/bectl(8): Remove now-redundant include paths
  
  These were previously necessary because the libnvpair and libzfs_core
  includes were not installed into the SYSROOT, being a part of the copies
  target in include/Makefile rather than being installed with the library.
  
  This was fixed in r337696 and the headers are now installed properly, so we
  may let go of the cruft.

Modified:
  head/cddl/lib/libbe/Makefile
  head/sbin/bectl/Makefile

Modified: head/cddl/lib/libbe/Makefile
==============================================================================
--- head/cddl/lib/libbe/Makefile	Mon Aug 13 03:43:49 2018	(r337698)
+++ head/cddl/lib/libbe/Makefile	Mon Aug 13 05:01:19 2018	(r337699)
@@ -17,9 +17,7 @@ LIBADD+= zfs
 LIBADD+= nvpair
 
 CFLAGS+= -I${LIBBE_SRC}
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem

Modified: head/sbin/bectl/Makefile
==============================================================================
--- head/sbin/bectl/Makefile	Mon Aug 13 03:43:49 2018	(r337698)
+++ head/sbin/bectl/Makefile	Mon Aug 13 05:01:19 2018	(r337699)
@@ -13,7 +13,6 @@ LIBADD+= util
 CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
 CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
 CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
 
 CFLAGS+= -DNEED_SOLARIS_BOOLEAN