svn commit: r253542 - head/release

[Glen Barber]

Author: gjb
Date: Mon Jul 22 12:07:57 2013
New Revision: 253542
URL: http://svnweb.freebsd.org/changeset/base/253542

Log:
  For consistency with previous releases, name the cdrom install
  cd 'disc1.iso'.
  
  Discussed with:	re@ team
  Approved by:	kib (mentor)
  MFC after:	3 days
  X-MFC-To:	stable/9 only

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Mon Jul 22 08:46:15 2013	(r253541)
+++ head/release/Makefile	Mon Jul 22 12:07:57 2013	(r253542)
@@ -3,7 +3,7 @@
 # Makefile for building releases and release media.
 # 
 # User-driven targets:
-#  cdrom: Builds release CD-ROM media (release.iso)
+#  cdrom: Builds release CD-ROM media (disc1.iso)
 #  memstick: Builds memory stick image (memstick.img)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Build all media and FTP distribution area
@@ -70,7 +70,7 @@ RELEASE_TARGETS= ftp
 IMAGES=
 .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
 RELEASE_TARGETS+= cdrom
-IMAGES+=	release.iso bootonly.iso
+IMAGES+=	disc1.iso bootonly.iso
 .endif
 .if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
 RELEASE_TARGETS+= memstick.img
@@ -161,7 +161,8 @@ bootonly: packagesystem
 	echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
 	cp ${.CURDIR}/rc.local bootonly/etc
 
-release.iso: system
+release.iso: disc1.iso
+disc1.iso: system
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
 
 bootonly.iso: bootonly
@@ -175,7 +176,7 @@ packagesystem: base.txz kernel.txz ${EXT
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}
 
-cdrom: release.iso bootonly.iso
+cdrom: disc1.iso bootonly.iso
 ftp: packagesystem
 	rm -rf ftp
 	mkdir -p ftp
@@ -192,7 +193,7 @@ clean:
 	rm -f *.txz MANIFEST
 	rm -f system
 	rm -rf release bootonly
-	rm -f release.iso bootonly.iso memstick.img
+	rm -f disc1.iso bootonly.iso memstick.img
 
 install:
 .if defined(DESTDIR) && !empty(DESTDIR)