Change variable name from DOCDISTFILES to RELEASEDISTFILES. Respect

DOCDISTFILES if defined.  No impact should happen with this change.

DOCDISTFILES is introduced by rev. 1.541, to point the directory that
contains the distfiles for ports/textproc/docproj.  It's good, but
we also build ports/sysutils/mkisofs during the release (if MAKE_ISOS
is defined).  It is natural that cdrtools tarball is prefetched, then
copy it under ${CHROOTDIR}/usr/ports/distfiles.

As a result, DOCDISTFILES variable is somewhat abused for non-doc
tarballs; *DOC*DISTFILES is no longger appropriate name for that.

PR:		16843
PR:		34194
Submitted by:	murray
MFC after:	6 days

1 files changed, 9 insertions, 4 deletions

diff --git a/release/Makefile b/release/Makefile
index 0bea19dadd8c..15e97568985a 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -103,8 +103,13 @@ NOPORTSATALL=	YES
 # by the RELNOTES_LANG variable above.
 ALLLANG?=	yes
 DOCPORTS=	textproc/docproj
-# Set this to wherever the distfiles required by ${DOCPORTS} live.
-DOCDISTFILES?=	${.CURDIR}/../../ports/distfiles
+# Set this to wherever the distfiles required by release procedures.
+.if defined(DOCDISTFILES)
+# Respect DOCDISTFILES which is used before.
+RELEASEDISTFILES?=	${DOCDISTFILES}
+.else
+RELEASEDISTFILES?=	${.CURDIR}/../../ports/distfiles
+.endif
 # Set this to 1 if you want -P to be used for automatic keyboard detection
 # on the boot floppy.  WARNING: Breaks on some Athlon (K7) motherboards.
 AUTO_KEYBOARD_DETECT?= 0
@@ -298,8 +303,8 @@ rerelease release:
 .else
 	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
 .endif
-	if [ -d ${DOCDISTFILES}/ ]; then \
-		cp -rp ${DOCDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
+	if [ -d ${RELEASEDISTFILES}/ ]; then \
+		cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
 	fi
 .endif
 .endif