From owner-svn-doc-head@freebsd.org Fri Feb 2 16:55:25 2018 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8702CEE3743; Fri, 2 Feb 2018 16:55:25 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3CEF573FA0; Fri, 2 Feb 2018 16:55:25 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B79B1E66E; Fri, 2 Feb 2018 16:55:25 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w12GtOue074725; Fri, 2 Feb 2018 16:55:24 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w12GtODA074724; Fri, 2 Feb 2018 16:55:24 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201802021655.w12GtODA074724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Fri, 2 Feb 2018 16:55:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51402 - head/share/mk X-SVN-Group: doc-head X-SVN-Commit-Author: wblock X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 51402 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 16:55:25 -0000 Author: wblock Date: Fri Feb 2 16:55:24 2018 New Revision: 51402 URL: https://svnweb.freebsd.org/changeset/doc/51402 Log: Unbreak building of translated PO files. Also intentionally hide make(1) output. This is not only unhelpful for translators, it is distracting from the already difficult job of translation. If verbose output is desired, 'make -l' can be used. Modified: head/share/mk/doc.translate.mk Modified: head/share/mk/doc.translate.mk ============================================================================== --- head/share/mk/doc.translate.mk Thu Feb 1 15:33:28 2018 (r51401) +++ head/share/mk/doc.translate.mk Fri Feb 2 16:55:24 2018 (r51402) @@ -43,16 +43,16 @@ MASTER_SRCS!= ${MAKE} -C ${EN_DIR} -V SRCS ${DOC}.translate.xml: .if ${TRAN_DIR} == ${EN_DIR} - @${ECHO} "Please build PO file only in a non-English dir, ignored" + @${ECHO} "Please build PO file only in a non-English directory, ignored" .else # some SRCS files might need to be generated, make sure they exist - ${MAKE} -C ${EN_DIR} ${MASTER_SRCS} > /dev/null + @${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 + @${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_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} + @${RM} ${.TARGET}.tmp + @${MAKE} -C ${EN_DIR} clean > /dev/null .endif .if ${TRAN_DIR} == ${EN_DIR} @@ -64,27 +64,27 @@ po: ${PO_LANG}.po .PHONY: po ${PO_LANG}.po: ${DOC}.translate.xml - ${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml + @${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml .if exists(${PO_LANG}.po) @${ECHO} "${PO_LANG}.po exists, merging" - ${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp - ${MSGATTRIB} --no-obsolete -o ${PO_LANG}.po.new ${PO_LANG}.po - ${MV} ${PO_LANG}.po.new ${PO_LANG}.po - ${RM} ${PO_LANG}.po.tmp ${DOC}.translate.xml + @${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp + @${MSGATTRIB} --no-obsolete -o ${PO_LANG}.po.new ${PO_LANG}.po + @${MV} ${PO_LANG}.po.new ${PO_LANG}.po + @${RM} ${PO_LANG}.po.tmp .else @${ECHO} "${PO_LANG}.po created, please check and correct the settings in the header" - ${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po - ${POSET_CMD} ${.TARGET} + @${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po + @${POSET_CMD} ${.TARGET} .endif ${PO_LANG}.mo: ${PO_LANG}.po - ${MSGFMT} -o ${.TARGET} ${.ALLSRC} + @${MSGFMT} -o ${.TARGET} ${.ALLSRC} tran ${DOC}.xml: ${DOC}.translate.xml ${PO_LANG}.mo .if ${TRAN_DIR} == ${EN_DIR} - @${ECHO} "Please build translation only in a non-English dir, ignored" + @${ECHO} "Please build translation only in a non-English directory, ignored" .else - ${ITSTOOL} -l ${PO_LANG} -m ${PO_LANG}.mo -o ${DOC}.xml ${DOC}.translate.xml + @${ITSTOOL} -l ${PO_LANG} -m ${PO_LANG}.mo -o ${DOC}.xml ${DOC}.translate.xml .endif .endif