From owner-svn-doc-head@freebsd.org  Mon Sep 10 17:05:46 2018
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5155B1096236;
 Mon, 10 Sep 2018 17:05:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 084048BD66;
 Mon, 10 Sep 2018 17:05:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F342633C4;
 Mon, 10 Sep 2018 17:05:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8AH5jQB098816;
 Mon, 10 Sep 2018 17:05:45 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8AH5jax098815;
 Mon, 10 Sep 2018 17:05:45 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201809101705.w8AH5jax098815@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Sep 2018 17:05:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r52243 -
 head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware
X-SVN-Group: doc-head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware
X-SVN-Commit-Revision: 52243
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Sep 2018 17:05:46 -0000

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"