diff options
| author | nyan <nyan@FreeBSD.org> | 2001-11-25 16:43:45 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2001-11-25 16:43:45 +0000 |
| commit | f312390d6f16e3b6470e9873c6b7275d2fa24fca (patch) | |
| tree | 65f701fcf9c2a6f631d1428d541541b316764f14 /release | |
| parent | 4a36d47b427cb60cc1d0380e84d352c2fe731470 (diff) | |
| download | FreeBSD-src-f312390d6f16e3b6470e9873c6b7275d2fa24fca.zip FreeBSD-src-f312390d6f16e3b6470e9873c6b7275d2fa24fca.tar.gz | |
Set a BOOTABLE variable to "-b" if MACHINE is not pc98, and use it for
mkisoimages.sh instead of "-b" directly.
MFC after: 1 week
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile index 8489434..9782758 100644 --- a/release/Makefile +++ b/release/Makefile @@ -221,6 +221,9 @@ CRUNCH_TARGETS= boot fixit EXTRAS= cdrom.1 ftp.1 .if defined(MAKE_ISOS) EXTRAS+= iso.1 +.if ${MACHINE} != "pc98" +BOOTABLE="-b" +.endif .endif .if !defined(NODOC) @@ -784,13 +787,13 @@ cdrom.1: iso.1: @if [ -r ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ]; then \ echo "Creating ISO images..."; \ - sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_miniinst \ - ${CD}/miniinst.iso ${CD_DISC1}; \ - sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_livefs \ - ${CD}/disc2.iso ${CD_DISC2}; \ + sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \ + fbsd_miniinst ${CD}/miniinst.iso ${CD_DISC1}; \ + sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \ + fbsd_livefs ${CD}/disc2.iso ${CD_DISC2}; \ if [ "x${CD_EXTRA_BITS}" != "x" ]; then \ - sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_boot \ - ${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \ + sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \ + fbsd_boot ${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \ && false; \ fi \ else \ |
