[Midnightbsd-cvs] src: cddl/usr.bin: $MidnightBSD$, fix paths

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/cddl/usr.bin:
        Makefile (r1.1 -> r1.2)
        Makefile.inc (r1.1 -> r1.2)
    src/cddl/usr.bin/ztest:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/cddl/usr.bin/Makefile.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/usr.bin/Makefile.inc -L cddl/usr.bin/Makefile.inc -u -r1.1 -r1.2
--- cddl/usr.bin/Makefile.inc
+++ cddl/usr.bin/Makefile.inc
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1 2007/04/06 01:08:58 pjd Exp $
 
 BINDIR?=	/usr/bin
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/usr.bin/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/usr.bin/Makefile -L cddl/usr.bin/Makefile -u -r1.1 -r1.2
--- cddl/usr.bin/Makefile
+++ cddl/usr.bin/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
 
 .include <bsd.own.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/usr.bin/ztest/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/usr.bin/ztest/Makefile -L cddl/usr.bin/ztest/Makefile -u -r1.1 -r1.2
--- cddl/usr.bin/ztest/Makefile
+++ cddl/usr.bin/ztest/Makefile
@@ -1,18 +1,19 @@
+# $MidnightBSD$
 # $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
 
 PROG=	ztest
 NO_MAN=
 
-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/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-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/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl//contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
 DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \