Add a DOCDISTFILES variable to point to a directory containing the
distfiles to build the docproj port during release. Prior to this, the distfiles were copied froom ${DISTFILES}. However, if like me, you needed to store the distfiles in some directory other than /usr/ports/distfiles, for example /usr/docdistfiles, then when you overrode ${DISTFILES} it broke the release build when it tried to build docproj port in the chroot'd release area. To preserve backwards compatibility, DOCDISTFILES defaults to the value of DISTFILES. Ok'd by: jkh
This commit is contained in:
parent
75b1eefecc
commit
19ea12d3ec
@ -56,8 +56,9 @@ OBJFORMAT?= elf
|
||||
# in English only.
|
||||
ALLLANG= yes
|
||||
DOCPORTS= textproc/docproj
|
||||
# Set this to wherever the distfiles required by ${DOCPORTS} live.
|
||||
DISTFILES?= ${.CURDIR}/../../ports/distfiles
|
||||
# Set this to wherever the distfiles required by ${DOCPORTS} live.
|
||||
DOCDISTFILES?= ${DISTFILES}
|
||||
|
||||
DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
|
||||
RELNOTES.TXT TROUBLE.TXT UPGRADE.TXT INSTALL.TXT
|
||||
@ -198,8 +199,8 @@ rerelease release:
|
||||
.else
|
||||
cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
|
||||
.endif
|
||||
if [ -d ${DISTFILES}/ ]; then \
|
||||
cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
|
||||
if [ -d ${DOCDISTFILES}/ ]; then \
|
||||
cp -rp ${DOCDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
|
||||
fi
|
||||
.endif
|
||||
.endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user