Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Jan 2016 23:42:48 +0000 (UTC)
From:      Warren Block <wblock@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r48098 - head/share/mk
Message-ID:  <201601262342.u0QNgmTC014583@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wblock
Date: Tue Jan 26 23:42:48 2016
New Revision: 48098
URL: https://svnweb.freebsd.org/changeset/doc/48098

Log:
  Run 'make SRCS' in the English document directory.  Some SRCS files are
  generated, like the list of mirrors used in the Handbook, and this will
  make certain they exist when the PO extraction process needs them.

Modified:
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Tue Jan 26 23:27:44 2016	(r48097)
+++ head/share/mk/doc.docbook.mk	Tue Jan 26 23:42:48 2016	(r48098)
@@ -299,18 +299,20 @@ POSET_CMD=	${SED} -i '' -e '1s,^,\#${IDS
 .if ${.TARGETS:Mpo} || ${.TARGETS:Mtran}
 
 MASTER_SRCS!=	${MAKE} -C ${EN_DIR} -V SRCS
-EN_SRCS=	${MASTER_SRCS:S,^,${EN_DIR}/,g}
 
-${DOC}.translate.xml:	${EN_SRCS}
+${DOC}.translate.xml:
 	@if [ "${TRAN_DIR}" == "${EN_DIR}" ]; then \
 		${ECHO} "build PO file in a non-English dir" ; \
 		exit 1 ; \
 	 fi
+	# some SRCS files might need to be generated, make sure they exist
+	@${MAKE} -C ${EN_DIR} ${MASTER_SRCS} > /dev/null
 	# normalize the English original into a single file
 	@${PO_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp
 	# remove redundant namespace attributes
 	@${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET}
 	@${RM} ${.TARGET}.tmp
+	@${MAKE} -C ${EN_DIR} clean > /dev/null
 
 po: ${PO_LANG}.po
 .PHONY:	po



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601262342.u0QNgmTC014583>