os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move variables specific to manual pages to be nested within

Browse source 
the target match evaluation of ${DOC}.html.

This is an attempt to fix what appears to be an intermittent
build race condition.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2018-09-10 17:05:45 +00:00
parent 286429de90
commit c5c574d15b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=52243
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
View file

@ -7,13 +7,6 @@
.include "../Makefile.hardware" .include "../Makefile.hardware"
.endif .endif
MAN4TMP!= ${MKTEMP} -d ${.CURDIR}/svn.XXXXXXXX
MAN4DIR= ${MAN4TMP}
.if exists(${MAN4DIR})
rm -rf ${MAN4DIR}
.endif
MAN4PAGES?= ${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
ARCHLIST?= ${DOC_PREFIX}/share/misc/dev.archlist.txt ARCHLIST?= ${DOC_PREFIX}/share/misc/dev.archlist.txt
MAN2HWNOTES_CMD=${DOC_PREFIX}/share/misc/man2hwnotes.pl MAN2HWNOTES_CMD=${DOC_PREFIX}/share/misc/man2hwnotes.pl
@ -31,11 +24,17 @@ INSTALL_ONLY_COMPRESSED=
CLEANDIRS+= ${.CURDIR}/svn.* CLEANDIRS+= ${.CURDIR}/svn.*
.if ${.TARGET:M${DOC}.html} .if ${.TARGET:M${DOC}.html}
MAN4TMP!= ${MKTEMP} -d ${.CURDIR}/svn.XXXXXXXX
MAN4DIR= ${MAN4TMP}
.if exists(${MAN4DIR})
rm -rf ${MAN4DIR}
.endif
MAN4PAGES?= ${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
hardware.parsed.xml: dev-auto.ent man4-rmsrc hardware.parsed.xml: dev-auto.ent man4-rmsrc
dev-auto.ent: man4-src-checkout dev-auto.ent: man4-src-checkout
${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES} || (rm -f ${.TARGET}) ${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES} || (rm -f ${.TARGET})
CLEANFILES+= dev-auto.ent CLEANFILES+= dev-auto.ent
.endif
man4-src-checkout: man4-src-checkout:
mkdir -p ${MAN4TMP} mkdir -p ${MAN4TMP}
@ -45,5 +44,6 @@ man4-src-checkout:
man4-rmsrc: man4-rmsrc:
@# Just in case. @# Just in case.
rm -rf ${MAN4DIR} || true rm -rf ${MAN4DIR} || true
.endif
.include "${DOC_PREFIX}/share/mk/doc.project.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk"