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

[Glen Barber]

Author: gjb
Date: Wed Dec  6 18:50:32 2017
New Revision: 51260
URL: https://svnweb.freebsd.org/changeset/doc/51260

Log:
  Fix generating pgpkeyring.txt when it does not exist, which seems
  to have been broken following r51076 or r51077.
  
  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	Wed Dec  6 09:15:25 2017	(r51259)
+++ head/en_US.ISO8859-1/htdocs/doc/Makefile	Wed Dec  6 18:50:32 2017	(r51260)
@@ -32,9 +32,10 @@ install:
 	  ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install
 	${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt
 
+beforeinstall:
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
 .if ${LANGCODE} == en_US.ISO8859-1
-all: all-pgpkeyring
+	${MAKE} -C ${.CURDIR} all-pgpkeyring
 .endif
 
 

Modified: head/share/pgpkeys/Makefile
==============================================================================
--- head/share/pgpkeys/Makefile	Wed Dec  6 09:15:25 2017	(r51259)
+++ head/share/pgpkeys/Makefile	Wed Dec  6 18:50:32 2017	(r51260)
@@ -7,6 +7,8 @@ XSLPGP=		http://www.FreeBSD.org/XML/share/xml/freebsd-
 FILES=		pgpkeyring.txt
 CLEANFILES=	pgpkeyring.txt keyring.xml
 
+all:	keyring.xml pgpkeyring pgpkeyring.txt
+
 keyring.xml:	.PHONY
 	@${ECHO_CMD} "<?xml version='1.0' encoding='UTF-8'?>" > ${.TARGET}
 	@${ECHO_CMD} "<keyring>" >> ${.TARGET}