aboutsummaryrefslogtreecommitdiff
path: root/cddl/lib
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/drti/Makefile8
-rw-r--r--cddl/lib/libavl/Makefile11
-rw-r--r--cddl/lib/libctf/Makefile8
-rw-r--r--cddl/lib/libdtrace/Makefile8
-rw-r--r--cddl/lib/libicp/Makefile14
-rw-r--r--cddl/lib/libicp_rescue/Makefile16
-rw-r--r--cddl/lib/libnvpair/Makefile14
-rw-r--r--cddl/lib/libspl/Makefile14
-rw-r--r--cddl/lib/libtpool/Makefile14
-rw-r--r--cddl/lib/libtpool/tests/Makefile2
-rw-r--r--cddl/lib/libuutil/Makefile10
-rw-r--r--cddl/lib/libzdb/Makefile18
-rw-r--r--cddl/lib/libzfs/Makefile32
-rw-r--r--cddl/lib/libzfs_core/Makefile26
-rw-r--r--cddl/lib/libzfsbootenv/Makefile18
-rw-r--r--cddl/lib/libzpool/Makefile4
-rw-r--r--cddl/lib/libzutil/Makefile20
-rw-r--r--cddl/lib/pam_zfs_key/Makefile20
18 files changed, 127 insertions, 130 deletions
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index 50250887e379..dda6168a8195 100644
--- a/cddl/lib/drti/Makefile
+++ b/cddl/lib/drti/Makefile
@@ -12,11 +12,11 @@ CLEANFILES= ${FILES}
.undef LIBRARIES_ONLY
CFLAGS+= -DIN_BASE
CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
-I${SRCTOP}/cddl/compat/opensolaris/include \
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index 4ce1de20a3d9..aef8c34c853c 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,4 +1,4 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
+.PATH: ${ZFSTOP}/module/avl
PACKAGE= zfs
LIB_PACKAGE=
@@ -8,9 +8,10 @@ LIBADD= spl
SRCS= avl.c
WARNS?= 3
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
+
.include <bsd.lib.mk>
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 1c605182bc1d..b47f4a47551a 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -22,10 +22,10 @@ WARNS?= 2
CFLAGS+= -DCTF_OLD_VERSIONS
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index dae6200d80c1..0742d0b5cd5a 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -78,11 +78,11 @@ WARNS?= 1
CFLAGS+= -DIN_BASE
CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
index 833ecbb1c7f7..15846e67a14b 100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -1,4 +1,4 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
+.PATH: ${ZFSTOP}/module/icp
PACKAGE= zfs
LIB_PACKAGE=
@@ -97,14 +97,14 @@ WARNS?= 2
SHLIB_MAJOR= 3
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile
index 0a5a81f4ab7f..8dc8c396774c 100644
--- a/cddl/lib/libicp_rescue/Makefile
+++ b/cddl/lib/libicp_rescue/Makefile
@@ -1,4 +1,4 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
+.PATH: ${ZFSTOP}/module/icp
PACKAGE= utilities
LIB= icp_rescue
@@ -86,7 +86,7 @@ KERNEL_C = \
core/kcf_prov_tabs.c \
$(ASM_SOURCES_C)
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs
+.PATH: ${ZFSTOP}/module/zfs
KERNEL_C+= zfs_impl.c
SRCS= $(ASM_SOURCES_AS) $(KERNEL_C)
@@ -95,14 +95,14 @@ WARNS?= 2
SHLIB_MAJOR= 3
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID -UHAVE_AVX -DRESCUE
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 8245b324688b..c66424cef219 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -1,6 +1,6 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+.PATH: ${ZFSTOP}/module/nvpair
+.PATH: ${ZFSTOP}/lib/libnvpair
+.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB_PACKAGE=
@@ -20,12 +20,12 @@ SRCS+= nvpair_alloc_fixed.c \
WARNS?= 2
CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID -DHAVE_CONFIG_H -DHAVE_XDR_BYTESREC
.include <bsd.lib.mk>
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 173e9116e284..b0f47172e52d 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -1,8 +1,8 @@
.include <bsd.init.mk>
.include <bsd.compiler.mk>
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+.PATH: ${ZFSTOP}/lib/libspl
+.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB_PACKAGE=
@@ -49,12 +49,12 @@ SRCS += \
WARNS?= 2
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
.if ${COMPILER_TYPE} == "clang"
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 3a50a21bf62c..1ebfc52f5be9 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+.PATH: ${ZFSTOP}/lib/libtpool
+.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB_PACKAGE=
@@ -14,13 +14,13 @@ SRCS= thread_pool.c
WARNS?= 2
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/libtpool/tests/Makefile b/cddl/lib/libtpool/tests/Makefile
index 19e43cc18821..72a82b6afa59 100644
--- a/cddl/lib/libtpool/tests/Makefile
+++ b/cddl/lib/libtpool/tests/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
ATF_TESTS_C+= libtpool_test
TEST_METADATA+= timeout="10"
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 947e755d4aae..ca5a71d811f7 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,4 +1,4 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
+.PATH: ${ZFSTOP}/lib/libuutil
PACKAGE= zfs
LIB_PACKAGE=
@@ -14,12 +14,12 @@ SRCS=\
WARNS?= 2
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
LIBADD= avl spl
diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
index 040d7d2c63f9..f5a6a42d7aad 100644
--- a/cddl/lib/libzdb/Makefile
+++ b/cddl/lib/libzdb/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+.PATH: ${ZFSTOP}/lib/libzdb
+.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB_PACKAGE=
@@ -13,15 +13,15 @@ SRCS = libzdb.c
WARNS?= 2
CSTD= c99
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/lib/libzutil
CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 376e32fb893f..ed0c240b1113 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -1,11 +1,11 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
+.PATH: ${ZFSTOP}/module/icp
+.PATH: ${ZFSTOP}/module/zcommon
+.PATH: ${ZFSTOP}/lib/libzfs
+.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd
+.PATH: ${ZFSTOP}/lib/libshare
+.PATH: ${ZFSTOP}/include
+.PATH: ${ZFSTOP}/module/zstd
+.PATH: ${ZFSTOP}/module/zstd/lib
PACKAGE= zfs
LIB_PACKAGE=
@@ -89,17 +89,17 @@ WARNS?= 2
SHLIB_MAJOR= 4
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libshare
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -DHAVE_EXECVPE
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index 10533c5de05b..72b0f519e21d 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -1,7 +1,7 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
+.PATH: ${ZFSTOP}/lib/libzfs_core
+.PATH: ${ZFSTOP}/include
+.PATH: ${ZFSTOP}/include/os/freebsd/zfs
+.PATH: ${ZFSTOP}/module/os/freebsd/zfs
PACKAGE= zfs
LIB_PACKAGE=
@@ -17,17 +17,17 @@ SRCS= libzfs_core.c \
WARNS?= 2
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libzfs_core
+CFLAGS+= -I${ZFSTOP}/lib/libzfs_core/common
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
index 22f5da1ee5b1..eba6a1d8bea8 100644
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+.PATH: ${ZFSTOP}/lib/libzfsbootenv
+.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB_PACKAGE=
@@ -20,16 +20,16 @@ SRCS= $(USER_C)
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
CFLAGS.lzbe_device.c= -Wno-cast-qual
CFLAGS.lzbe_util.c= -Wno-cast-qual
CFLAGS.lzbe_pair.c= -Wno-cast-qual
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 031cc27fb431..80fec2eb3fb1 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/lib/libzpool
# ZFS_COMMON_SRCS
@@ -263,7 +261,7 @@ CFLAGS+= \
-I${ZFSTOP}/include \
-I${ZFSTOP}/lib/libspl/include \
-I${ZFSTOP}/lib/libspl/include/os/freebsd \
- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
+ -I${ZFSTOP}/lib/libzpool/include \
-I${SRCTOP}/sys \
-I${SRCTOP}/cddl/compat/opensolaris/include \
-I${ZFSTOP}/module/icp/include \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index 37e9e8dd5e63..952ebda889b2 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -1,6 +1,6 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
+.PATH: ${ZFSTOP}/lib/libzutil
+.PATH: ${ZFSTOP}/lib/libzutil/os/freebsd
+.PATH: ${ZFSTOP}/module/os/freebsd/zfs
PACKAGE= zfs
LIB_PACKAGE=
@@ -27,15 +27,15 @@ SRCS += zfs_ioctl_compat.c
WARNS?= 2
CSTD= c99
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/lib/libzutil
CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile
index 517ca402d4da..345321b5926d 100644
--- a/cddl/lib/pam_zfs_key/Makefile
+++ b/cddl/lib/pam_zfs_key/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key
-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+.PATH: ${ZFSTOP}/contrib/pam_zfs_key
+.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB= pam_zfs_key
@@ -13,17 +13,17 @@ SRCS= pam_zfs_key.c
WARNS?= 2
CSTD= c99
CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
CFLAGS+= -DRUNSTATEDIR=\"/var/run\"
.include "../../lib/libpam/modules/Makefile.inc"
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 05:09:27 +0000