aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cddl/Makefile.inc4
-rw-r--r--cddl/lib/libavl/Makefile6
-rw-r--r--cddl/lib/libnvpair/Makefile10
-rw-r--r--cddl/lib/libumem/Makefile4
-rw-r--r--cddl/lib/libuutil/Makefile14
-rw-r--r--cddl/lib/libzfs/Makefile32
-rw-r--r--cddl/lib/libzpool/Makefile34
-rw-r--r--cddl/sbin/zfs/Makefile26
-rw-r--r--cddl/sbin/zpool/Makefile26
-rw-r--r--cddl/usr.bin/ztest/Makefile18
-rw-r--r--cddl/usr.sbin/zdb/Makefile18
-rw-r--r--sys/modules/zfs/Makefile8
-rw-r--r--usr.bin/fstat/zfs/Makefile16
13 files changed, 108 insertions, 108 deletions
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index f424b270c4dd..bece24423413 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
-OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
IGNORE_PRAGMA= YES
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index 2fd2262099dc..8cbaff1eca82 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= avl
SRCS= avl.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 62e0794cc127..120339002ce4 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
LIB= nvpair
@@ -10,8 +10,8 @@ SRCS= libnvpair.c \
nvpair_alloc_fixed.c \
nvpair.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index ba033011ec75..6b6881e327a9 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
LIB= umem
SRCS= umem.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
.include <bsd.lib.mk>
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 5fc4a261683e..309ffd0eb76f 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= uutil
SRCS= avl.c \
@@ -16,10 +16,10 @@ SRCS= avl.c \
uu_strtoint.c
CFLAGS+= -DNATIVE_BUILD
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
.include <bsd.lib.mk>
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index a8f2c01f8e03..a896b8f93ab9 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
DPADD= ${LIBUTIL}
@@ -31,17 +31,17 @@ SRCS+= zfs_namecheck.c \
CFLAGS+= -DZFS_NO_ACL
CFLAGS+= -I${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
.include <bsd.lib.mk>
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index f086b6d02b1d..0890073f4181 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -1,21 +1,21 @@
# $FreeBSD$
-.include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
+.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
# ZFS_COMMON_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
# ZFS_SHARED_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
# KERNEL_SRCS
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
# LIST_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= atomic.S
.else
-.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
ATOMIC_SRCS= opensolaris_atomic.c
.endif
@@ -29,17 +29,17 @@ LIST_SRCS= list.c
SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
DPADD= ${LIBPTHREAD} ${LIBZ}
LDADD= -lpthread -lz
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index f6065c9ea333..4a9274ef9fa3 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,23 +1,23 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
PROG= zfs
MAN= zfs.8
SRCS= zfs_main.c zfs_iter.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index f2739c2baecd..04d6c13f99ab 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,23 +1,23 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
PROG= zpool
MAN= zpool.8
SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 49502ab46cc8..0bdded66bf0f 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,18 +1,18 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
PROG= ztest
NO_MAN=
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 72b9b306a8b1..92a73522a82e 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -1,19 +1,19 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb
PROG= zdb
MAN= zdb.8
SRCS= zdb.c zdb_il.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 88f404156fa3..fb99e3d10895 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -4,7 +4,7 @@ KMOD= zfs
SRCS= vnode_if.h
-SUNW= ${.CURDIR}/../../contrib/opensolaris
+SUNW= ${.CURDIR}/../../cddl/contrib/opensolaris
.PATH: ${SUNW}/common/acl
SRCS+= acl_common.c
@@ -13,7 +13,7 @@ SRCS+= avl.c
.PATH: ${SUNW}/common/nvpair
SRCS+= nvpair.c
-.PATH: ${.CURDIR}/../../compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
SRCS+= opensolaris_kmem.c
SRCS+= opensolaris_kobj.c
SRCS+= opensolaris_kstat.c
@@ -27,7 +27,7 @@ SRCS+= opensolaris_zone.c
.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH}
SRCS+= atomic.S
.else
-.PATH: ${.CURDIR}/../../compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
SRCS+= opensolaris_atomic.c
.endif
@@ -70,7 +70,7 @@ SRCS+= vdev_geom.c
# Use FreeBSD's namecache.
CFLAGS+=-DFREEBSD_NAMECACHE
-CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
+CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
CFLAGS+=-I${SUNW}/uts/common/fs/zfs
CFLAGS+=-I${SUNW}/uts/common/zmod
CFLAGS+=-I${SUNW}/uts/common
diff --git a/usr.bin/fstat/zfs/Makefile b/usr.bin/fstat/zfs/Makefile
index adbe1690f97c..7896fcc17381 100644
--- a/usr.bin/fstat/zfs/Makefile
+++ b/usr.bin/fstat/zfs/Makefile
@@ -6,14 +6,14 @@ SRCS= zfs.c
OBJS= zfs.o
WARNS?= 1
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/..
all: ${OBJS}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 23:55:19 +0000