os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix building pgpkeyring.txt with parallel builds by setting .ORDER

Browse source 
targets. [1]

While here, change the all-pgpkeyring target, forgotten in r51260.

Reported by:	wosch [1]
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2017-12-12 16:27:43 +00:00
parent 870aad0cf4
commit f42eb9f25c
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=51301
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
en_US.ISO8859-1/htdocs/doc/Makefile
View file

@ -21,7 +21,7 @@ all-all:
${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
all-pgpkeyring: all-pgpkeyring:
${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys all
clean: clean:
${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean

6
share/pgpkeys/Makefile
View file

@ -7,6 +7,9 @@ XSLPGP= http://www.FreeBSD.org/XML/share/xml/freebsd-pgpkeyring.xsl
FILES= pgpkeyring.txt FILES= pgpkeyring.txt
CLEANFILES= pgpkeyring.txt keyring.xml CLEANFILES= pgpkeyring.txt keyring.xml
.ORDER: pgpkeyring pgpkeyring.txt
.ORDER: keyring.xml pgpkeyring.txt
all: keyring.xml pgpkeyring pgpkeyring.txt all: keyring.xml pgpkeyring pgpkeyring.txt
keyring.xml: .PHONY keyring.xml: .PHONY
@ -19,7 +22,8 @@ pgpkeyring: keyring.xml
@${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} keyring.xml @${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} keyring.xml
pgpkeyring.txt: pgpkeyring.txt:
@${MAKE} pgpkeyring > ${.TARGET}.tmp @${RM} -f ${.TARGET}.tmp || true
@${MAKE} -C ${.CURDIR} pgpkeyring > ${.TARGET}.tmp
${MV} ${.TARGET}.tmp ${.TARGET} ${MV} ${.TARGET}.tmp ${.TARGET}
.include "${DOC_PREFIX}/share/mk/doc.project.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk"