diff options
author | jkh <jkh@FreeBSD.org> | 1997-06-22 17:21:59 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-06-22 17:21:59 +0000 |
commit | 7bf6a981bc720d7cc5458dd92e293fed9a592386 (patch) | |
tree | d5448b210c284b72d8b977c6ebcf24a348c3c9c0 /release/Makefile | |
parent | 2dc5ff96e76a38f1a5ffd4c22e350c882f7592eb (diff) | |
download | FreeBSD-src-7bf6a981bc720d7cc5458dd92e293fed9a592386.zip FreeBSD-src-7bf6a981bc720d7cc5458dd92e293fed9a592386.tar.gz |
The doc dist was being made too early - move it.
Diffstat (limited to 'release/Makefile')
-rw-r--r-- | release/Makefile | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/release/Makefile b/release/Makefile index 8dd9cd7..323911f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.303 1997/06/22 08:37:49 jkh Exp $ +# $Id: Makefile,v 1.304 1997/06/22 10:17:32 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -85,6 +85,15 @@ BOOTSTRAPUTILS+= /usr/bin/cpio CRUNCH_TARGETS= boot fixit .endif +EXTRAS= cdrom.1 +.if !defined(NOPORTS) +EXTRAS+= ports.1 +.endif + +.if !defined(NODOC) +DOCREL= doc.1 +.endif + REDO?= sysinstall REDOSED= sed -e 's/dirs/release.1/' -e 's/trees/release.2/' \ -e 's/kerns/release.3/' -e 's/sysinstall/release.4/' \ @@ -172,6 +181,9 @@ rerelease release: .if defined(NOPORTS) echo "export NOPORTS=${NOPORTS}" >> ${CHROOTDIR}/mk .endif +.if defined(NODOC) + echo "export NODOC=${NODOC}" >> ${CHROOTDIR}/mk +.endif # Don't remove this, or the build will fall over! echo "export RELEASEDIR=/R" >> ${CHROOTDIR}/mk echo "export PATH=${BOOTSTRAPDIR}:$${PATH}" >> ${CHROOTDIR}/mk @@ -193,9 +205,6 @@ rerelease release: .if make(rerelease) echo "make all install" >> ${CHROOTDIR}/mk .endif -.if !defined(NODOC) - echo "cd /usr/doc && make all distribute DISTDIR=/R/stage/trees" >> ${CHROOTDIR}/mk -.endif echo "cd /usr/src/release/sysinstall" >> ${CHROOTDIR}/mk echo "make obj" >> ${CHROOTDIR}/mk echo "cd /usr/src/release" >> ${CHROOTDIR}/mk @@ -505,6 +514,9 @@ ports.1: tar -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD} +doc.1: + cd /usr/doc && make all distribute DISTDIR=${RD}/trees + # Various "subroutine" and other supporting targets. doTARBALL: @@ -541,13 +553,9 @@ doTARBALL: md5 * > CHECKSUM.MD5) \ ) -doRELEASE: release.1 release.2 release.3 release.4 release.5 release.6 \ - release.7 release.8 release.9 -.if defined(NOPORTS) - cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1 -.else - cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1 ports.1 -.endif +doRELEASE: release.1 release.2 release.3 release.4 release.5 ${DOCREL} \ + release.6 release.7 release.8 release.9 + cd ${.CURDIR} && ${MAKE} ${EXTRAS} @echo "Release done" floppies: |