From owner-svn-doc-all@freebsd.org Thu Oct 12 14:57:30 2017 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8AC5FE2BC87; Thu, 12 Oct 2017 14:57:30 +0000 (UTC) (envelope-from wosch@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 mx1.freebsd.org (Postfix) with ESMTPS id 568F87E78F; Thu, 12 Oct 2017 14:57:30 +0000 (UTC) (envelope-from wosch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9CEvTsH035647; Thu, 12 Oct 2017 14:57:29 GMT (envelope-from wosch@FreeBSD.org) Received: (from wosch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9CEvT1a035646; Thu, 12 Oct 2017 14:57:29 GMT (envelope-from wosch@FreeBSD.org) Message-Id: <201710121457.v9CEvT1a035646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wosch set sender to wosch@FreeBSD.org using -f From: Wolfram Schneider Date: Thu, 12 Oct 2017 14:57:29 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51110 - head/share/mk X-SVN-Group: doc-head X-SVN-Commit-Author: wosch X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 51110 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2017 14:57:30 -0000 Author: wosch Date: Thu Oct 12 14:57:29 2017 New Revision: 51110 URL: https://svnweb.freebsd.org/changeset/doc/51110 Log: refactor to use make syntax instead shell/test scripts PR: 222939 Modified: head/share/mk/doc.translate.mk Modified: head/share/mk/doc.translate.mk ============================================================================== --- head/share/mk/doc.translate.mk Thu Oct 12 14:38:11 2017 (r51109) +++ head/share/mk/doc.translate.mk Thu Oct 12 14:57:29 2017 (r51110) @@ -65,17 +65,17 @@ po: ${PO_LANG}.po ${PO_LANG}.po: ${DOC}.translate.xml @${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml - @( if [ -f "${PO_LANG}.po" ]; then \ - 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 ; \ - 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} ; \ - fi ) +.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 +.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} +.endif ${PO_LANG}.mo: ${PO_LANG}.po @${MSGFMT} -o ${.TARGET} ${.ALLSRC}