[Midnightbsd-cvs] src: cddl/sbin: $MidnightBSD$, fix paths

[laffer1 at midnightbsd.org]

Log Message:
-----------
$MidnightBSD$, fix paths

Modified Files:
--------------
    src/cddl/sbin:
        Makefile (r1.1 -> r1.2)
        Makefile.inc (r1.1 -> r1.2)
    src/cddl/sbin/zfs:
        Makefile (r1.1 -> r1.2)
    src/cddl/sbin/zpool:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/cddl/sbin/Makefile.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/sbin/Makefile.inc -L cddl/sbin/Makefile.inc -u -r1.1 -r1.2
--- cddl/sbin/Makefile.inc
+++ cddl/sbin/Makefile.inc
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/sbin/Makefile.inc,v 1.1 2007/04/06 01:08:57 pjd Exp $
 
 BINDIR?=	/sbin
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/sbin/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/sbin/Makefile -L cddl/sbin/Makefile -u -r1.1 -r1.2
--- cddl/sbin/Makefile
+++ cddl/sbin/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
 
 .include <bsd.own.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/sbin/zfs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/sbin/zfs/Makefile -L cddl/sbin/zfs/Makefile -u -r1.1 -r1.2
--- cddl/sbin/zfs/Makefile
+++ cddl/sbin/zfs/Makefile
@@ -1,23 +1,24 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
-.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}
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/sbin/zpool/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/sbin/zpool/Makefile -L cddl/sbin/zpool/Makefile -u -r1.1 -r1.2
--- cddl/sbin/zpool/Makefile
+++ cddl/sbin/zpool/Makefile
@@ -1,23 +1,24 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
-.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}