aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2018-08-13 05:01:19 +0000
committerKyle Evans <kevans@FreeBSD.org>2018-08-13 05:01:19 +0000
commitf2fdf2a1dcbe9ccf90a2658423fb377be99561d6 (patch)
tree1e3ad00ef339fb7617ae3617456610f619b10d75
parent00ece7c2a3e908752e9c8f4727dc1aa404c682ba (diff)
downloadsrc-f2fdf2a1dcbe9ccf90a2658423fb377be99561d6.tar.gz
src-f2fdf2a1dcbe9ccf90a2658423fb377be99561d6.zip
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.
Notes
Notes: svn path=/head/; revision=337699
-rw-r--r--cddl/lib/libbe/Makefile2
-rw-r--r--sbin/bectl/Makefile1
2 files changed, 0 insertions, 3 deletions
diff --git a/cddl/lib/libbe/Makefile b/cddl/lib/libbe/Makefile
index 7d2facc6d282..29ee0680a572 100644
--- a/cddl/lib/libbe/Makefile
+++ b/cddl/lib/libbe/Makefile
@@ -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
diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile
index 5435eb14a0a9..0014f9642611 100644
--- a/sbin/bectl/Makefile
+++ b/sbin/bectl/Makefile
@@ -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