diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= zfs +PACKAGE= libzfs LIB= avl LIBADD= spl SRCS= avl.c diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -5,7 +5,7 @@ LIB= nvpair LIBADD= spl -PACKAGE= zfs +PACKAGE= libzfs # user INCS= libnvpair.h SRCS= libnvpair.c \ diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -6,7 +6,7 @@ LIB= spl LIBADD= -PACKAGE= zfs +PACKAGE= libzfs SRCS = \ assert.c \ diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -4,7 +4,7 @@ LIB= tpool LIBADD= spl -PACKAGE= zfs +PACKAGE= libzfs INCS= thread_pool_impl.h SRCS= thread_pool.c diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= zfs +PACKAGE= libzfs LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= zfs +PACKAGE= libzfs LIB= uutil SRCS=\ uu_alloc.c \ diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -7,7 +7,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= zfs +PACKAGE= libzfs LIB= zfs LIBADD= \ avl \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -6,7 +6,7 @@ LIB= zfs_core LIBADD= nvpair spl zutil -PACKAGE= zfs +PACKAGE= libzfs INCS= libzfs_core.h SRCS= libzfs_core.c \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -4,7 +4,7 @@ LIB= zutil LIBADD= avl geom m tpool -PACKAGE= zfs +PACKAGE= libzfs INCS = zutil_import.h diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,4 +1,4 @@ -PACKAGE= ufs +PACKAGE= libufs LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 8