diff options
| author | matusita <matusita@FreeBSD.org> | 2002-02-03 07:00:37 +0000 |
|---|---|---|
| committer | matusita <matusita@FreeBSD.org> | 2002-02-03 07:00:37 +0000 |
| commit | 8083cc277746bcd1513acdc477f37b50ce253a13 (patch) | |
| tree | ff0b364fa94c16b94b7410b49a646cde62a4e825 /release | |
| parent | 10b0acc83425e75cf8b837508b5b8979a821bc30 (diff) | |
| download | FreeBSD-src-8083cc277746bcd1513acdc477f37b50ce253a13.zip FreeBSD-src-8083cc277746bcd1513acdc477f37b50ce253a13.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile index 0bea19d..15e9756 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 |
