Merge fs/cd9660/ into cd9660.

6 files changed, 11 insertions, 13 deletions

diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index b1f26968eec..13ea8c53011 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2016/10/17 08:13:24 natano Exp $
+#	$OpenBSD: Makefile,v 1.7 2016/10/18 16:50:55 natano Exp $
 #	$NetBSD: Makefile,v 1.36 2013/08/05 14:41:57 reinoud Exp $
 #
 
@@ -24,15 +24,13 @@ SRCS+=	msdosfs_lookup.c msdosfs_denode.c msdosfs_vnops.c msdosfs_unicode.c
 
 MAN=	makefs.8
 
-CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/fs/cd9660
-CPPFLAGS+=	-I${.CURDIR}/fs/msdosfs -I${.CURDIR}/newfs_msdos
+CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/fs/msdosfs -I${.CURDIR}/newfs_msdos
 #CPPFLAGS+=	-DMSDOSFS_DEBUG
 
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 
-.PATH:	${.CURDIR}/cd9660 ${.CURDIR}/fs/cd9660 \
-	${.CURDIR}/ffs ${.CURDIR}/ufs/ffs \
+.PATH:	${.CURDIR}/cd9660 ${.CURDIR}/ffs ${.CURDIR}/ufs/ffs \
 	${.CURDIR}/msdos ${.CURDIR}/fs/msdosfs ${.CURDIR}/newfs_msdos
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index 6315432a1f7..f519f495ec3 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.h,v 1.4 2016/10/17 08:22:38 natano Exp $	*/
+/*	$OpenBSD: cd9660.h,v 1.5 2016/10/18 16:50:55 natano Exp $	*/
 /*	$NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -51,8 +51,8 @@
 #include <sys/endian.h>
 
 #include "makefs.h"
-#include "iso.h"
-#include "iso_rrip.h"
+#include "cd9660/iso.h"
+#include "cd9660/iso_rrip.h"
 #include "cd9660/cd9660_eltorito.h"
 
 #ifdef DEBUG
diff --git a/usr.sbin/makefs/fs/cd9660/cd9660_rrip.h b/usr.sbin/makefs/cd9660/cd9660_rrip.h
index 82f54448c44..43f4810dafe 100644
--- a/usr.sbin/makefs/fs/cd9660/cd9660_rrip.h
+++ b/usr.sbin/makefs/cd9660/cd9660_rrip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_rrip.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: cd9660_rrip.h,v 1.1 2016/10/18 16:50:55 natano Exp $	*/
 /*	$NetBSD: cd9660_rrip.h,v 1.3 2005/12/03 17:34:43 christos Exp $	*/
 
 /*-
diff --git a/usr.sbin/makefs/fs/cd9660/iso.h b/usr.sbin/makefs/cd9660/iso.h
index 139907b1cc0..aa7eef44cdd 100644
--- a/usr.sbin/makefs/fs/cd9660/iso.h
+++ b/usr.sbin/makefs/cd9660/iso.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: iso.h,v 1.1 2016/10/18 16:50:55 natano Exp $	*/
 /*	$NetBSD: iso.h,v 1.10 2011/09/27 01:01:44 christos Exp $	*/
 
 /*-
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h
index 012c2e34011..dffefbdb12e 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.h
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso9660_rrip.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: iso9660_rrip.h,v 1.3 2016/10/18 16:50:55 natano Exp $	*/
 /*	$NetBSD: iso9660_rrip.h,v 1.6 2013/01/28 21:03:28 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 /* For writing must use ISO_RRIP_EXTREF structure */
 
 #include "makefs.h"
-#include <cd9660_rrip.h>
+#include "cd9660/cd9660_rrip.h"
 #include "cd9660.h"
 #include <sys/queue.h>
 
diff --git a/usr.sbin/makefs/fs/cd9660/iso_rrip.h b/usr.sbin/makefs/cd9660/iso_rrip.h
index 2d1c742e35b..ec5d0b2f11e 100644
--- a/usr.sbin/makefs/fs/cd9660/iso_rrip.h
+++ b/usr.sbin/makefs/cd9660/iso_rrip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso_rrip.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: iso_rrip.h,v 1.1 2016/10/18 16:50:55 natano Exp $	*/
 /*	$NetBSD: iso_rrip.h,v 1.4 2005/12/03 17:34:43 christos Exp $	*/
 
 /*-