svn commit: r47599 - head/share/mk

Warren Block <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.