From 793e8c6f6e48edc755fb7b3491dba6918785a23b Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Sun, 22 Jun 1997 17:21:59 +0000
Subject: [PATCH] The doc dist was being made too early - move it.

---
 release/Makefile | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 8dd9cd78eaac..323911ff6662 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/' \
@@ -171,6 +180,9 @@ rerelease release:
 .endif
 .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
@@ -192,9 +204,6 @@ rerelease release:
 .endif
 .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
@@ -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: