From owner-freebsd-doc Thu Jan 31 0:21:24 2002 Delivered-To: freebsd-doc@freebsd.org Received: from mao.stokely.org (mao.stokely.org [65.84.64.228]) by hub.freebsd.org (Postfix) with ESMTP id 27C8D37B400; Thu, 31 Jan 2002 00:20:55 -0800 (PST) Received: by mao.stokely.org (Postfix, from userid 2074) id 967404B661; Thu, 31 Jan 2002 00:20:49 -0800 (PST) Date: Thu, 31 Jan 2002 00:20:49 -0800 From: Murray Stokely To: Makoto Matsushita Cc: doc@FreeBSD.org, jhb@FreeBSD.org, ast@marabu.ch Subject: Re: src/release/Makefile: renaming 'DOCDISTFILES' Message-ID: <20020131082049.GS9395@freebsdmall.com> References: <20020131100115W.matusita@jp.FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020131100115W.matusita@jp.FreeBSD.org> User-Agent: Mutt/1.3.25i X-GPG-Key-ID: 1024D/0E451F7D X-GPG-Key-Fingerprint: E2CA 411D DD44 53FD BB4B 3CB5 B4D7 10A2 0E45 1F7D Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org I think this is a good idea, but I think we should continue to accept the old DOCDISTFILES variable, to support existing scripts that may be in place doing release builds. .if defined(DOCDISTFILES) RELEASEDISTFILES?= ${DOCDISTFILES} .else RELEASEDISTFILES?= ${.CURDIR}/../../ports/distfiles .endif Or something similar at the top of the Makefile. - Murray On Thu, Jan 31, 2002 at 10:01:15AM +0900, Makoto Matsushita wrote: > > In src/release/Makefile revision 1.541, 'DOCDISTFILES' variable is > introduced that points to a directory containing the distfiles to > build the textproc/docproj during doc.1 target is processed. > > However, ports is not used in doc stage in these days -- iso.1 target > to create ISO image, requires sysutils/mkisofs. It is natual that > prefetching cdrtools tarball and copy it ${CHROOTDIR}/user/ports/distfiles > prior to whole release procedure. > > Yes, it can be easily done with 'DOCDISTFILES'. But it is *not* doc > related. If all of you concerning doesn't matter, I want to change > its variable name to something other appropriate name. > > Attached below is a patch to rename this variable. In this patch, I > employ 'RELEASEDISTFILES' for a new candidate. But I have no idea > about this new name; if you want to name it, that's OK to me. > > Any comments? > > -- - > Makoto `MAR' Matsushita > > Index: Makefile > =================================================================== > RCS file: /home/ncvs/src/release/Makefile,v > retrieving revision 1.655 > diff -u -r1.655 Makefile > --- Makefile 31 Jan 2002 00:38:09 -0000 1.655 > +++ Makefile 31 Jan 2002 00:58:28 -0000 > @@ -103,8 +103,8 @@ > # 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. > +RELEASEDISTFILES?= ${.CURDIR}/../../ports/distfiles > # 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 +298,8 @@ > .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 > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-doc" in the body of the message To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message