[Midnightbsd-cvs] src: cddl/lib: Fix some of the paths to files.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 15 15:10:22 EDT 2008
Log Message:
-----------
Fix some of the paths to files.
Modified Files:
--------------
src/cddl/lib:
Makefile (r1.1 -> r1.2)
src/cddl/lib/libavl:
Makefile (r1.1 -> r1.2)
src/cddl/lib/libnvpair:
Makefile (r1.1 -> r1.2)
src/cddl/lib/libumem:
Makefile (r1.1 -> r1.2)
src/cddl/lib/libuutil:
Makefile (r1.1 -> r1.2)
src/cddl/lib/libzfs:
Makefile (r1.1 -> r1.2)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/Makefile -L cddl/lib/Makefile -u -r1.1 -r1.2
--- cddl/lib/Makefile
+++ cddl/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $MidnightBSD$
.include <bsd.own.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/libavl/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/libavl/Makefile -L cddl/lib/libavl/Makefile -u -r1.1 -r1.2
--- cddl/lib/libavl/Makefile
+++ cddl/lib/libavl/Makefile
@@ -1,10 +1,11 @@
+# $MidnightBSD$
# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= avl
SRCS= avl.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/libnvpair/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/libnvpair/Makefile -L cddl/lib/libnvpair/Makefile -u -r1.1 -r1.2
--- cddl/lib/libnvpair/Makefile
+++ cddl/lib/libnvpair/Makefile
@@ -1,7 +1,8 @@
+# $MidnightBSD$
# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
LIB= nvpair
@@ -10,8 +11,8 @@
nvpair_alloc_fixed.c \
nvpair.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../include # XXX
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/libumem/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/libumem/Makefile -L cddl/lib/libumem/Makefile -u -r1.1 -r1.2
--- cddl/lib/libumem/Makefile
+++ cddl/lib/libumem/Makefile
@@ -1,9 +1,10 @@
+# $MidnightBSD$
# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
-.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
LIB= umem
SRCS= umem.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
.include <bsd.lib.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/libuutil/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/libuutil/Makefile -L cddl/lib/libuutil/Makefile -u -r1.1 -r1.2
--- cddl/lib/libuutil/Makefile
+++ cddl/lib/libuutil/Makefile
@@ -1,7 +1,8 @@
+# $MidnightBSD$
# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= uutil
SRCS= avl.c \
@@ -16,10 +17,10 @@
uu_strtoint.c
CFLAGS+= -DNATIVE_BUILD
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
.include <bsd.lib.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/cddl/lib/libzfs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L cddl/lib/libzfs/Makefile -L cddl/lib/libzfs/Makefile -u -r1.1 -r1.2
--- cddl/lib/libzfs/Makefile
+++ cddl/lib/libzfs/Makefile
@@ -1,9 +1,10 @@
+# $MidnightBSD$
# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $
-.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
DPADD= ${LIBUTIL}
@@ -31,17 +32,17 @@
CFLAGS+= -DZFS_NO_ACL
CFLAGS+= -I${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-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/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/sys/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/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
.include <bsd.lib.mk>
More information about the Midnightbsd-cvs
mailing list