svn commit: r52243 - head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware

Glen Barber gjb at FreeBSD.org
Mon Sep 10 17:05:46 UTC 2018


Author: gjb
Date: Mon Sep 10 17:05:45 2018
New Revision: 52243
URL: https://svnweb.freebsd.org/changeset/doc/52243

Log:
  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

Modified:
  head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile

Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile	Mon Sep 10 06:02:40 2018	(r52242)
+++ head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile	Mon Sep 10 17:05:45 2018	(r52243)
@@ -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"


More information about the svn-doc-all mailing list