diff options
| author | Ken Smith <kensmith@FreeBSD.org> | 2004-04-30 04:21:00 +0000 |
|---|---|---|
| committer | Ken Smith <kensmith@FreeBSD.org> | 2004-04-30 04:21:00 +0000 |
| commit | 614ff03681e326ed1548c6bcbe301b11a0d0c0f4 (patch) | |
| tree | 6bb050b4bbf9ae8346bc231f748a91ec4183cce9 | |
| parent | 727c013e4f91ace8a1aa1a8a99b3e9050722b58b (diff) | |
Notes
| -rw-r--r-- | release/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index 4555e347669a..6e340da1a837 100644 --- a/release/Makefile +++ b/release/Makefile @@ -106,6 +106,13 @@ DOMINIMALDOCPORTS= YES .include "Makefile.inc.docports" .endif +# Make changing names of disc1 CD possible. Usually disc1 directory +# contents is used for creating both miniinst and disc1. +DISC1_LABEL?= fbsd_miniinst +DISC1_NAME?= miniinst +DISC2_LABEL?= fbsd_livefs +DISC2_NAME?= disc2 + # Helper variable .if defined(NOPORTS) .if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES" @@ -363,6 +370,10 @@ rerelease release: BOOT_CONFIG \ BUILDNAME \ CD_EXTRA_BITS \ + DISC1_LABEL \ + DISC1_NAME \ + DISC2_LABEL \ + DISC2_NAME \ DISTRIBUTIONS \ DOC_LANG \ DOMINIMALDOCPORTS \ @@ -811,9 +822,9 @@ iso.1: @if [ -r ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ]; then \ echo "Creating ISO images..."; \ sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_miniinst ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}; \ + ${DISC1_LABEL} ${CD}/${BUILDNAME}-${TARGET}-${DISC1_NAME}.iso ${CD_DISC1}; \ sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_livefs ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}; \ + ${DISC2_LABEL} ${CD}/${BUILDNAME}-${TARGET}-${DISC2_NAME}.iso ${CD_DISC2}; \ if [ "x${CD_EXTRA_BITS}" != "x" ]; then \ sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ fbsd_boot ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \ |