At least I'm consistent. Back out the last accidental rev to this file on
HEAD too. Noticed by: ben Another pointy hat to: bmah
This commit is contained in:
parent
31ce46afbf
commit
464af731bc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=88557
@ -191,7 +191,6 @@ FIXCRYPTO+= usr.sbin/sendmail
|
||||
MTREEFILES= ${.CURDIR}/../etc/mtree
|
||||
_R?= /R
|
||||
RD= ${_R}/stage
|
||||
RND= ${RD}/release.doc
|
||||
FD= ${_R}/ftp
|
||||
CD= ${_R}/cdrom
|
||||
CD_DISC1= ${CD}/disc1
|
||||
@ -618,10 +617,10 @@ release.8:
|
||||
gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
|
||||
.if !defined(NODOC)
|
||||
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
|
||||
gzip -9c ${RND}/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
|
||||
gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
|
||||
done
|
||||
@for i in ${DIST_DOCS_ARCH_DEP}; do \
|
||||
gzip -9c ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
|
||||
gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
|
||||
done
|
||||
@mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT.gz ${RD}/mfsfd/stand/help/INSTALL.TXT.gz
|
||||
.endif
|
||||
@ -694,7 +693,7 @@ release.9:
|
||||
${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
|
||||
# Do our last minute floppies directory setup in a convenient place.
|
||||
.if !defined(NODOC)
|
||||
@cp ${RND}/${RELNOTES_LANG}/installation/${MACHINE_ARCH}/article.txt \
|
||||
@cp ${.CURDIR}/doc/${RELNOTES_LANG}/installation/${MACHINE_ARCH}/article.txt \
|
||||
${RD}/floppies/README.TXT
|
||||
@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
|
||||
.else
|
||||
@ -713,14 +712,14 @@ ftp.1:
|
||||
@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
|
||||
.if !defined(NODOC)
|
||||
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
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; \
|
||||
done
|
||||
@for i in ${DIST_DOCS_ARCH_DEP}; do \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
done
|
||||
@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD}
|
||||
@cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/docbook.css ${FD}
|
||||
@mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT
|
||||
@mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM
|
||||
.endif
|
||||
@ -752,14 +751,14 @@ cdrom.1:
|
||||
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
|
||||
.if !defined(NODOC)
|
||||
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
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; \
|
||||
done
|
||||
@for i in ${DIST_DOCS_ARCH_DEP}; do \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
|
||||
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
|
||||
done
|
||||
@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1}
|
||||
@cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1}
|
||||
@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
|
||||
@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
|
||||
.endif
|
||||
@ -819,7 +818,7 @@ doc.1:
|
||||
#
|
||||
doc.2:
|
||||
@echo "Making release documentation..."
|
||||
@cd ${.CURDIR}/doc && make all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' DOCDIR=${RND}
|
||||
@cd ${.CURDIR}/doc && make all 'FORMATS=html txt'
|
||||
touch doc.2
|
||||
|
||||
# Various "subroutine" and other supporting targets.
|
||||
|
Loading…
Reference in New Issue
Block a user