Fold the functionality of NORELNOTES into NODOC. There is now only
one Makefile variable to control the building/installation of both the DocProj documents and RELNOTESng. Suggested by: obrien, dd Tested by: John Hay <jhay@icomtek.csir.co.za>
This commit is contained in:
parent
c4d5bb5129
commit
21203b38d7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77493
@ -69,15 +69,11 @@ OBJFORMAT?= elf
|
||||
# CPU cycles (some of the programs are C++, and things like ghostscript
|
||||
# belong to the required ports nevertheless).
|
||||
#
|
||||
# Setting this also disables doc.2 (RELNOTESng).
|
||||
# Setting this also disables building of release note documentation
|
||||
# (RELNOTESng).
|
||||
#NODOC= YES
|
||||
#NOPORTS= YES
|
||||
|
||||
# RELNOTESng can be disabled by uncommenting the following variable
|
||||
# definition. RELNOTESng depends on having ports enabled for this
|
||||
# release build.
|
||||
#NORELNOTES= YES
|
||||
|
||||
# Uncomment and modify this definition if you want the release notes
|
||||
# and other release documentation in a language other than English.
|
||||
#RELNOTES_LANG= en_US.ISO_8859-1
|
||||
@ -109,7 +105,7 @@ DOCDISTFILES?= ${.CURDIR}/../../ports/distfiles
|
||||
# on the boot floppy. WARNING: Breaks on some Athlon (K7) motherboards.
|
||||
AUTO_KEYBOARD_DETECT?= 0
|
||||
|
||||
.if !defined(NORELNOTES)
|
||||
.if !defined(NODOC)
|
||||
DIST_DOCS_ARCH_INDEP= readme errata
|
||||
DIST_DOCS_ARCH_DEP= installation relnotes hardware
|
||||
.endif
|
||||
@ -219,10 +215,7 @@ EXTRAS= cdrom.1 ftp.1
|
||||
.endif
|
||||
|
||||
.if !defined(NODOC)
|
||||
DOCREL= doc.1
|
||||
.if !defined(NORELNOTES)
|
||||
DOCREL+= doc.2
|
||||
.endif
|
||||
DOCREL= doc.1 doc.2
|
||||
.endif
|
||||
|
||||
.if !defined(NOPORTREADMES)
|
||||
@ -240,11 +233,6 @@ rerelease release:
|
||||
@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
|
||||
@exit 1
|
||||
.endif
|
||||
.if !defined(NORELNOTES) && defined(NODOC)
|
||||
@echo "Docs are required for building the release notes. Either"
|
||||
@echo "set NORELNOTES or unset NODOC!"
|
||||
@exit 1
|
||||
.endif
|
||||
.if make(release)
|
||||
.if exists(${CHROOTDIR})
|
||||
# The first command will fail on a handful of files that have their schg
|
||||
@ -357,9 +345,6 @@ rerelease release:
|
||||
.if defined(NOSRC)
|
||||
echo "export NOSRC=${NOSRC}" >> ${CHROOTDIR}/mk
|
||||
.endif
|
||||
.if defined(NORELNOTES)
|
||||
echo "export NORELNOTES=${NORELNOTES}" >> ${CHROOTDIR}/mk
|
||||
.endif
|
||||
.if defined(RELNOTES_LANG)
|
||||
echo "export RELNOTES_LANG=${RELNOTES_LANG}" >> ${CHROOTDIR}/mk
|
||||
.else
|
||||
@ -617,7 +602,7 @@ release.8: write_mfs_in_kernel
|
||||
ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
|
||||
ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
|
||||
gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
|
||||
.if !defined(NORELNOTES)
|
||||
.if !defined(NODOC)
|
||||
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
|
||||
gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
|
||||
done
|
||||
@ -694,7 +679,7 @@ release.9:
|
||||
@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
|
||||
${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
|
||||
# Do our last minute floppies directory setup in a convenient place.
|
||||
.if !defined(NORELNOTES)
|
||||
.if !defined(NODOC)
|
||||
@cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/article.txt \
|
||||
${RD}/floppies/README.TXT
|
||||
@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
|
||||
@ -712,7 +697,7 @@ ftp.1:
|
||||
-@ln -s . ${FD}/${BUILDNAME}
|
||||
@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
|
||||
@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
|
||||
.if !defined(NORELNOTES)
|
||||
.if !defined(NODOC)
|
||||
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
@ -751,7 +736,7 @@ cdrom.1:
|
||||
@cp ${.CURDIR}/fixit.profile ${CD_DISC2}/.profile
|
||||
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf
|
||||
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
|
||||
.if !defined(NORELNOTES)
|
||||
.if !defined(NODOC)
|
||||
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
|
Loading…
Reference in New Issue
Block a user