Index: release/Makefile
===================================================================
RCS file: /usr/cvs/src/release/Makefile,v
retrieving revision 1.536.2.111.2.1
diff -u -r1.536.2.111.2.1 Makefile
--- release/Makefile	23 Oct 2003 04:54:31 -0000	1.536.2.111.2.1
+++ release/Makefile	6 Nov 2003 19:44:19 -0000
@@ -376,6 +376,7 @@
 	MAKE_ISOS \
 	NOCDROM \
 	NODOC \
+	NO_FLOPPIES \
 	NOKERBEROS \
 	NOPORTS \
 	NOSHARED \
@@ -666,6 +668,7 @@
 	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
 		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
 	@gzip -9vc mfsroot > mfsroot.gz
+.if !defined(NO_FLOPPIES)
 .if ${TARGET} == "pc98"
 	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
 		${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
@@ -678,6 +681,10 @@
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
 .endif
+.else
+	@mkdir -p ${RD}/image.boot
+	@cp mfsroot.gz ${RD}/image.boot/
+.endif
 	@rm mfsroot mfsroot.gz
 	@echo "Regular and MFS boot floppies made."
 	touch release.9
@@ -686,6 +693,7 @@
 # --==## Create a fixit floppy ##==--
 #
 release.10:
+.if !defined(NO_FLOPPIES)
 	@echo "Making fixit floppy."
 	@rm -rf ${RD}/fixitfd
 	@mkdir ${RD}/fixitfd
@@ -716,6 +724,7 @@
 .else
 	@(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
 .endif
+.endif
 	touch release.10
 
 #
@@ -792,9 +801,9 @@
 	@echo 'intro' > ${CD_DISC1}/boot/kernel.conf
 .endif
 	@ln -f ${CD_DISC1}/boot/loader.conf ${CD_DISC2}/boot/loader.conf
 	@ln -f ${CD_DISC2}/kernel.GENERIC ${CD_DISC1}/kernel
 .endif
-.if ${TARGET} == "i386"
+.if ${TARGET} == "i386" && !defined(NO_FLOPPIES)
 	@mkdir -p ${CD_DISC2}/floppies
 	@cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
 .endif