aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/Makefile2
-rw-r--r--cddl/lib/libzfs/Makefile2
-rw-r--r--cddl/sbin/zpool/Makefile3
-rw-r--r--cddl/share/Makefile13
-rw-r--r--cddl/share/zfs/Makefile9
-rw-r--r--cddl/share/zfs/compatibility.d/Makefile28
6 files changed, 55 insertions, 2 deletions
diff --git a/cddl/Makefile b/cddl/Makefile
index d01199b5d9af..7b9d13146afa 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
SUBDIR= lib .WAIT \
- sbin usr.bin usr.sbin
+ sbin share usr.bin usr.sbin
SUBDIR.${MK_TESTS}+= tests
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index d0b3458eda64..b159955c0212 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -103,6 +103,8 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
+CFLAGS+= -DSYSCONFDIR=\"/etc\"
+CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\"
.include <bsd.lib.mk>
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index fbde6beec331..43cc8f2997b7 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -71,7 +71,8 @@ CFLAGS+= \
-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
- -DSYSCONFDIR=\"/etc\"
+ -DSYSCONFDIR=\"/etc\" \
+ -DPKGDATADIR=\"/usr/share/zfs\"
LIBADD= geom nvpair uutil zfs zutil avl spl tpool zfs_core m
LDADD+= -pthread
diff --git a/cddl/share/Makefile b/cddl/share/Makefile
new file mode 100644
index 000000000000..68670ffbe7e0
--- /dev/null
+++ b/cddl/share/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+SUBDIR= ${_zfs}
+
+.if ${MK_ZFS} != "no"
+_zfs= zfs
+.endif
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
diff --git a/cddl/share/zfs/Makefile b/cddl/share/zfs/Makefile
new file mode 100644
index 000000000000..98e10b60aae6
--- /dev/null
+++ b/cddl/share/zfs/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+SUBDIR= compatibility.d
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile
new file mode 100644
index 000000000000..6531430ef050
--- /dev/null
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d
+
+FILES= \
+ compat-2018 \
+ compat-2019 \
+ compat-2020 \
+ compat-2021 \
+ freebsd-11.0 \
+ freebsd-11.2 \
+ freebsd-11.3 \
+ freenas-9.10.2 \
+ grub2 \
+ openzfsonosx-1.7.0 \
+ openzfsonosx-1.8.1 \
+ openzfsonosx-1.9.3 \
+ openzfs-2.0-freebsd \
+ openzfs-2.0-linux \
+ zol-0.6.5 \
+ zol-0.7 \
+ zol-0.8
+
+FILESDIR= ${SHAREDIR}/zfs/compatibility.d
+
+.include <bsd.prog.mk>