diff options
| author | John Birrell <jb@FreeBSD.org> | 2008-03-27 23:21:25 +0000 |
|---|---|---|
| committer | John Birrell <jb@FreeBSD.org> | 2008-03-27 23:21:25 +0000 |
| commit | e327f524464c142bd1d3b59cd22a966d2fffbfea (patch) | |
| tree | fb79d1ba12186e7d8bdaa8ff7434a9cdfb55eec4 /sys/modules/zfs | |
| parent | 244586d6f1194710c2242063b8f68f0c7b071601 (diff) | |
| download | src-e327f524464c142bd1d3b59cd22a966d2fffbfea.tar.gz src-e327f524464c142bd1d3b59cd22a966d2fffbfea.zip | |
The sources covered by Sun's CDDL have been repo copied below the
src/cddl and src/sys/cddl directories per the core@ decision following
the license review.
This change modifies the affected Makefiles to reference the sources
in their new location.
Notes
Notes:
svn path=/head/; revision=177674
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
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 |