PERFORCE change 88172 for review

[soc-andrew]

http://perforce.freebsd.org/chv.cgi?CH=88172

Change 88172 by soc-andrew at soc-andrew_serv on 2005/12/14 09:38:33

	Move release.9 to release.8 when BSDINSTALLER is defined

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#20 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#20 (text+ko) ====

@@ -694,6 +694,7 @@
 .endif
 	touch ${.TARGET}
 
+.if !defined(BSDINSTALLER)
 # Build the memory root filesystem.
 release.8:
 	cp ${RD}/trees/base/etc/disktab /etc
@@ -758,9 +759,9 @@
 	    ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
 	@gzip -9fnv ${RD}/mfsroot/mfsroot
 	touch ${.TARGET}
-
+.else
 # Build the BSD Installer mfs images
-release.9:
+release.8:
 	rm -rf ${RD}/bsdinstaller
 	mkdir ${RD}/bsdinstaller
 	( for dir in root usr var ; do \
@@ -806,6 +807,7 @@
 	  10000 ${RD}/bsdinstaller/root ${MFSINODE} auto
 	@gzip -9fnv ${RD}/bsdinstaller/mfsroot
 	touch ${.TARGET}
+.endif
 
 KERNFLOPPYSET=		${RD}/floppyset/kern/kernel.gz
 .if defined(SMALLFLOPPYSIZE)
@@ -1176,7 +1178,7 @@
 	)
 
 doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \
-    release.5 release.6 release.7 release.8 release.9 ${EXTRAS}
+    release.5 release.6 release.7 release.8 ${EXTRAS}
 	@echo "Release done"
 
 floppies: