Date: Fri, 16 Oct 2015 22:30:03 +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: r47599 - head/share/mk Message-ID: <201510162230.t9GMU3bW001235@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Fri Oct 16 22:30:02 2015 New Revision: 47599 URL: https://svnweb.freebsd.org/changeset/doc/47599 Log: Use the en_US xmllint catalog variables so translated entities do not make their way into PO translations. Reviewed by: rene Modified: head/share/mk/doc.docbook.mk Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Fri Oct 16 19:05:52 2015 (r47598) +++ head/share/mk/doc.docbook.mk Fri Oct 16 22:30:02 2015 (r47599) @@ -278,6 +278,7 @@ TRAN_DIR?= ${MASTERDOC:H} EN_DIR?= ${TRAN_DIR:S/${LANGCODE}/en_US.ISO8859-1/} PO_LANG?= ${LANGCODE:C/\..*$//} PO_CHARSET?= ${LANGCODE:tl:C/^.*\.//:S/^iso/iso-/:S/utf-8/UTF-8/} +EN_XMLLINT?= ${XMLLINT:S/${PO_LANG}/en_US/g} CLEANFILES+= ${DOC}.translate.xml ${PO_LANG}.mo # fix settings in PO file @@ -292,9 +293,9 @@ ${DOC}.translate.xml: exit 1 ; \ fi # normalize the English original into a single file - @${XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp + @${EN_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp # remove redundant namespace attributes - @${XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} + @${EN_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} @${RM} ${.TARGET}.tmp po: ${PO_LANG}.po
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510162230.t9GMU3bW001235>