[Midnightbsd-cvs] src: Makefile: Fix paths.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Fix paths.

Modified Files:
--------------
    src/cddl/lib/libzpool:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/libzpool/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/libzpool/Makefile -L cddl/lib/libzpool/Makefile -u -r1.1 -r1.2
--- cddl/lib/libzpool/Makefile
+++ cddl/lib/libzpool/Makefile
@@ -1,21 +1,22 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $
 
-.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}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.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 +30,17 @@
 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