[Midnightbsd-cvs] src: Makefile: Correct some paths

[laffer1 at midnightbsd.org]

Log Message:
-----------
Correct some paths

Modified Files:
--------------
    src/sys/modules/zfs:
        Makefile (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/zfs/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/modules/zfs/Makefile -L sys/modules/zfs/Makefile -u -r1.1.1.1 -r1.2
--- sys/modules/zfs/Makefile
+++ sys/modules/zfs/Makefile
@@ -4,14 +4,14 @@
 
 SRCS=	vnode_if.h
 
-.PATH:	${.CURDIR}/../../contrib/opensolaris/common/acl
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/acl
 SRCS+=	acl_common.c
-.PATH:	${.CURDIR}/../../contrib/opensolaris/common/avl
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/avl
 SRCS+=	avl.c
-.PATH:	${.CURDIR}/../../contrib/opensolaris/common/nvpair
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/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
@@ -21,29 +21,29 @@
 SRCS+=	opensolaris_vfs.c
 SRCS+=	opensolaris_zone.c
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH:	${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 SRCS+=	atomic.S
 .else
-.PATH:	${.CURDIR}/../../compat/opensolaris/kern
+.PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_atomic.c
 .endif
 
-.PATH:	${.CURDIR}/../../contrib/opensolaris/uts/common/fs
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs
 SRCS+=	gfs.c
 
-.PATH:	${.CURDIR}/../../contrib/opensolaris/uts/common/os
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/os
 SRCS+=	callb.c
 SRCS+=	list.c
 SRCS+=	nvpair_alloc_system.c
 SRCS+=	taskq.c
 
-.PATH:	${.CURDIR}/../../contrib/opensolaris/uts/common/rpc
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/rpc
 SRCS+=	xdr.c
 SRCS+=	xdr_array.c
 SRCS+=	xdr_mem.c
 
-.PATH:	${.CURDIR}/../../contrib/opensolaris/uts/common/zmod
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod
 SRCS+=	adler32.c
 SRCS+=	crc32.c
 SRCS+=	deflate.c
@@ -55,9 +55,9 @@
 SRCS+=	zmod_subr.c
 SRCS+=	zutil.c
 
-.PATH:	${.CURDIR}/../../contrib/opensolaris/common/zfs
-.include "${.CURDIR}/../../contrib/opensolaris/uts/common/Makefile.files"
-.PATH:	${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs
+.include "${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/Makefile.files"
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs
 ZFS_SRCS=	${ZFS_OBJS:C/.o$/.c/}
 SRCS+=	${ZFS_SRCS}
 SRCS+=	vdev_geom.c
@@ -78,13 +78,13 @@
 
 CFLAGS+=-D_SOLARIS_C_SOURCE
 
-CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common
+CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common
 CFLAGS+=-I${.CURDIR}/../..
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common/zfs
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common
 CFLAGS+=-I${.CURDIR}/../../../include
 
 WARNS?=1