aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-09-10 17:05:45 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-09-10 17:05:45 +0000
commitc5c574d15bcdf13527428d7de9b9bb3da1be1e54 (patch)
tree429a7fd555dc9d869d040ce01a890c59116856e7
parent286429de90c75331dfda0ff267eccda00766d77d (diff)
downloaddoc-c5c574d15bcdf13527428d7de9b9bb3da1be1e54.tar.gz
doc-c5c574d15bcdf13527428d7de9b9bb3da1be1e54.zip
Move variables specific to manual pages to be nested within
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
Notes
Notes: svn path=/head/; revision=52243
-rw-r--r--en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
index 7a6f6ab7ee..a36684ffe4 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
@@ -7,13 +7,6 @@
.include "../Makefile.hardware"
.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
MAN2HWNOTES_CMD=${DOC_PREFIX}/share/misc/man2hwnotes.pl
@@ -31,11 +24,17 @@ INSTALL_ONLY_COMPRESSED=
CLEANDIRS+= ${.CURDIR}/svn.*
.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
dev-auto.ent: man4-src-checkout
${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES} || (rm -f ${.TARGET})
CLEANFILES+= dev-auto.ent
-.endif
man4-src-checkout:
mkdir -p ${MAN4TMP}
@@ -45,5 +44,6 @@ man4-src-checkout:
man4-rmsrc:
@# Just in case.
rm -rf ${MAN4DIR} || true
+.endif
.include "${DOC_PREFIX}/share/mk/doc.project.mk"