From owner-svn-doc-head@freebsd.org Tue Dec 12 16:27:45 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29504E9E121; Tue, 12 Dec 2017 16:27:45 +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 mx1.freebsd.org (Postfix) with ESMTPS id E8C2A646A2; Tue, 12 Dec 2017 16:27:44 +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 vBCGRiPf049547; Tue, 12 Dec 2017 16:27:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBCGRhYb049545; Tue, 12 Dec 2017 16:27:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201712121627.vBCGRhYb049545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 12 Dec 2017 16:27:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51301 - in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys X-SVN-Group: doc-head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys X-SVN-Commit-Revision: 51301 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.25 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2017 16:27:45 -0000 Author: gjb Date: Tue Dec 12 16:27:43 2017 New Revision: 51301 URL: https://svnweb.freebsd.org/changeset/doc/51301 Log: Fix building pgpkeyring.txt with parallel builds by setting .ORDER targets. [1] While here, change the all-pgpkeyring target, forgotten in r51260. Reported by: wosch [1] Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/htdocs/doc/Makefile head/share/pgpkeys/Makefile Modified: head/en_US.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/doc/Makefile Tue Dec 12 16:04:47 2017 (r51300) +++ head/en_US.ISO8859-1/htdocs/doc/Makefile Tue Dec 12 16:27:43 2017 (r51301) @@ -21,7 +21,7 @@ all-all: ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all all-pgpkeyring: - ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys all clean: ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean Modified: head/share/pgpkeys/Makefile ============================================================================== --- head/share/pgpkeys/Makefile Tue Dec 12 16:04:47 2017 (r51300) +++ head/share/pgpkeys/Makefile Tue Dec 12 16:27:43 2017 (r51301) @@ -7,6 +7,9 @@ XSLPGP= http://www.FreeBSD.org/XML/share/xml/freebsd- FILES= pgpkeyring.txt CLEANFILES= pgpkeyring.txt keyring.xml +.ORDER: pgpkeyring pgpkeyring.txt +.ORDER: keyring.xml pgpkeyring.txt + all: keyring.xml pgpkeyring pgpkeyring.txt keyring.xml: .PHONY @@ -19,7 +22,8 @@ pgpkeyring: keyring.xml @${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} keyring.xml pgpkeyring.txt: - @${MAKE} pgpkeyring > ${.TARGET}.tmp + @${RM} -f ${.TARGET}.tmp || true + @${MAKE} -C ${.CURDIR} pgpkeyring > ${.TARGET}.tmp ${MV} ${.TARGET}.tmp ${.TARGET} .include "${DOC_PREFIX}/share/mk/doc.project.mk"