d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set a BOOTABLE variable to "-b" if MACHINE is not pc98, and use it for

Browse Source 
mkisoimages.sh instead of "-b" directly.

MFC after:	1 week
This commit is contained in:
Yoshihiro Takahashi 2001-11-25 16:43:45 +00:00
parent 1699365d1a
commit 29921a60d7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/Makefile
View File

@ -221,6 +221,9 @@ CRUNCH_TARGETS= boot fixit
EXTRAS= cdrom.1 ftp.1 EXTRAS= cdrom.1 ftp.1
.if defined(MAKE_ISOS) .if defined(MAKE_ISOS)
EXTRAS+= iso.1 EXTRAS+= iso.1
.if ${MACHINE} != "pc98"
BOOTABLE="-b"
.endif
.endif .endif
.if !defined(NODOC) .if !defined(NODOC)
@ -784,13 +787,13 @@ cdrom.1:
iso.1: iso.1:
@if [ -r ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ]; then \ @if [ -r ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ]; then \
echo "Creating ISO images..."; \ echo "Creating ISO images..."; \
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_miniinst \ sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \
${CD}/miniinst.iso ${CD_DISC1}; \ fbsd_miniinst ${CD}/miniinst.iso ${CD_DISC1}; \
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_livefs \ sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \
${CD}/disc2.iso ${CD_DISC2}; \ fbsd_livefs ${CD}/disc2.iso ${CD_DISC2}; \
if [ "x${CD_EXTRA_BITS}" != "x" ]; then \ if [ "x${CD_EXTRA_BITS}" != "x" ]; then \
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_boot \ sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \
${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \ fbsd_boot ${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \
&& false; \ && false; \
fi \ fi \
else \ else \