diff options
| author | kensmith <kensmith@FreeBSD.org> | 2006-11-16 23:09:35 +0000 |
|---|---|---|
| committer | kensmith <kensmith@FreeBSD.org> | 2006-11-16 23:09:35 +0000 |
| commit | e0f6a1563711cdeb783d38be6573a2d8c1e127e4 (patch) | |
| tree | 03b79d87d1e8e5f852a7db60bea380b373f91842 | |
| parent | 755a61c0b7c9e14fa6631f9b74ad6c6d85c86567 (diff) | |
| download | FreeBSD-src-e0f6a1563711cdeb783d38be6573a2d8c1e127e4.zip FreeBSD-src-e0f6a1563711cdeb783d38be6573a2d8c1e127e4.tar.gz | |
Move the documentation to its own separate disc to make room for more
packages on disc2. This will also let users decide if they want to
have a CD of the docs at all - unless they're disconnected from the
net they will probably find the Web site more useful.
Reviewed by: ru
MFC after: 3 days
| -rw-r--r-- | release/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index f894c37..4c40c67 100644 --- a/release/Makefile +++ b/release/Makefile @@ -257,6 +257,9 @@ CD= ${_R}/cdrom CD_BOOT= ${CD}/bootonly CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 +.if !defined(NODOC) +CD_DOCS= ${CD}/docs +.endif .if defined(SEPARATE_LIVEFS) CD_LIVEFS= ${CD}/livefs .else @@ -982,12 +985,15 @@ cdrom.2: @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf @echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf .if !defined(NODOC) - @mkdir -p ${CD_DISC2}/usr/share/doc + echo "Building CDROM docs filesystem image" + @mkdir -p ${CD_DOCS} + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf + @mkdir -p ${CD_DOCS}/usr/share/doc @for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \ if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \ -d /usr/doc/$$i ]; then \ mv ${CD_LIVEFS}/usr/share/doc/$$i \ - ${CD_DISC2}/usr/share/doc; \ + ${CD_DOCS}/usr/share/doc; \ fi \ done .endif @@ -1039,6 +1045,11 @@ iso.1: FreeBSD_Packages \ ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ ${CD_DISC2_PKGS} +.if !defined(NODOC) + @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ + FreeBSD_Documentation \ + ${CD}/${BUILDNAME}-${TARGET}-docs.iso ${CD_DOCS} +.endif .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_LiveFS \ |
