svn commit: r51301 - in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys

[Glen Barber]

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"