diff options
author | jb <jb@FreeBSD.org> | 2008-03-27 23:21:25 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 2008-03-27 23:21:25 +0000 |
commit | 5794ada908cc2e195ebcb0217b7164e3bd207e1b (patch) | |
tree | fb79d1ba12186e7d8bdaa8ff7434a9cdfb55eec4 /cddl/lib/libzpool/Makefile | |
parent | 586e0246eb781c4b3abd8db78b14582a53fbf171 (diff) | |
download | FreeBSD-src-5794ada908cc2e195ebcb0217b7164e3bd207e1b.zip FreeBSD-src-5794ada908cc2e195ebcb0217b7164e3bd207e1b.tar.gz |
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.
Diffstat (limited to 'cddl/lib/libzpool/Makefile')
-rw-r--r-- | cddl/lib/libzpool/Makefile | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index f086b6d..0890073 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 |