diff options
| author | obrien <obrien@FreeBSD.org> | 2004-08-16 08:28:58 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2004-08-16 08:28:58 +0000 |
| commit | 9feb07074295ed11299297f436bea66629e414c8 (patch) | |
| tree | e112b653d3cef9b9c3e1aa04e1fcf9dec6d60cec /release/Makefile | |
| parent | d68b744f1687258199c634bf1d1e237847dc9217 (diff) | |
| download | FreeBSD-src-9feb07074295ed11299297f436bea66629e414c8.zip FreeBSD-src-9feb07074295ed11299297f436bea66629e414c8.tar.gz | |
Accept the fact that floppies either aren't applicable or relevant on most
platforms. So make the floppy logic easier to read.
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile index 6a56e4b..2d464d5 100644 --- a/release/Makefile +++ b/release/Makefile @@ -169,6 +169,7 @@ MNT= /mnt # .if ${TARGET_ARCH} == "i386" +FLOPPIES= true .if ${TARGET} == "pc98" SMALLFLOPPYSIZE= 1200 SMALLFLOPPYSPLITSIZE= 1152 @@ -184,6 +185,7 @@ MFSSIZE= 4320 MFSINODE= 8000 MFSLABEL= minimum3 .elif ${TARGET_ARCH} == "alpha" +FLOPPIES= true FLOPPYSIZE= 1440 FLOPPYSPLITSIZE= 1392 FLOPPYINODE= 40000 @@ -199,17 +201,14 @@ MFSSIZE= 4096 MFSINODE= 8192 MFSLABEL= auto MINIROOT= -NO_FLOPPIES= .elif ${TARGET_ARCH} == "ia64" MFSSIZE= 8192 MFSINODE= 8192 MFSLABEL= auto -NO_FLOPPIES= .elif ${TARGET_ARCH} == "amd64" MFSSIZE= 4096 MFSINODE= 8192 MFSLABEL= auto -NO_FLOPPIES= .endif .if exists(/sbin/bsdlabel) @@ -251,7 +250,7 @@ CRUNCH_TARGETS+=fixit-small .endif .endif -.if !defined(NO_FLOPPIES) +.if defined(FLOPPIES) EXTRAS= floppies.1 .if ${TARGET_ARCH} == "i386" EXTRAS+= floppies.2 @@ -447,7 +446,7 @@ release rerelease: NOSRC \ NO_CPU_CFLAGS \ NO_CPU_COPTFLAGS \ - NO_FLOPPIES \ + FLOPPIES \ NO_SENDMAIL \ RELEASETAG \ RELNOTES_LANG \ @@ -513,7 +512,7 @@ release.1: -chflags -R noschg ${_R}/. rm -rf ${_R}/* mkdir ${RD} -.if !defined(NO_FLOPPIES) +.if defined(FLOPPIES) mkdir ${RD}/floppies .endif mkdir ${RD}/trees @@ -825,7 +824,7 @@ ftp.1: @echo "Setting up FTP distribution area" @mkdir -p ${FD} -@ln -s . ${FD}/${BUILDNAME} -.if !defined(NO_FLOPPIES) +.if defined(FLOPPIES) @cd ${RD} && find floppies -print | cpio -dumpl ${FD} .endif @cd ${RD}/dists && find . -print | cpio -dumpl ${FD} @@ -858,7 +857,7 @@ cdrom.1: @echo "Setting up CDROM distribution area" @mkdir -p ${CD_BOOT} ${CD_DISC1} ${CD_DISC2} -@ln -s . ${CD_DISC1}/${BUILDNAME} -.if !defined(NO_FLOPPIES) +.if defined(FLOPPIES) @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DISC1} .endif @cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DISC1} |
