From owner-svn-doc-all@freebsd.org  Thu Oct 12 14:38:13 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
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 00801E2B248;
 Thu, 12 Oct 2017 14:38:13 +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 C3B2F7D7FA;
 Thu, 12 Oct 2017 14:38:12 +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 v9CEcBis026386;
 Thu, 12 Oct 2017 14:38:11 GMT (envelope-from wosch@FreeBSD.org)
Received: (from wosch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9CEcBU5026384;
 Thu, 12 Oct 2017 14:38:11 GMT (envelope-from wosch@FreeBSD.org)
Message-Id: <201710121438.v9CEcBU5026384@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wosch set sender to
 wosch@FreeBSD.org using -f
From: Wolfram Schneider <wosch@FreeBSD.org>
Date: Thu, 12 Oct 2017 14:38:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r51109 - in head/share: . mk
X-SVN-Group: doc-head
X-SVN-Commit-Author: wosch
X-SVN-Commit-Paths: in head/share: . mk
X-SVN-Commit-Revision: 51109
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 &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Oct 2017 14:38:13 -0000

Author: wosch
Date: Thu Oct 12 14:38:11 2017
New Revision: 51109
URL: https://svnweb.freebsd.org/changeset/doc/51109

Log:
  no fatal errors for english documents
  
  refactor to use make syntax instead shell/test scripts
  
  PR: 222939

Modified:
  head/share/Makefile
  head/share/mk/doc.translate.mk

Modified: head/share/Makefile
==============================================================================
--- head/share/Makefile	Thu Oct 12 14:14:41 2017	(r51108)
+++ head/share/Makefile	Thu Oct 12 14:38:11 2017	(r51109)
@@ -2,4 +2,6 @@
 
 SUBDIR+=	pgpkeys
 
+po:
+
 .include <bsd.subdir.mk>

Modified: head/share/mk/doc.translate.mk
==============================================================================
--- head/share/mk/doc.translate.mk	Thu Oct 12 14:14:41 2017	(r51108)
+++ head/share/mk/doc.translate.mk	Thu Oct 12 14:38:11 2017	(r51109)
@@ -42,10 +42,9 @@ POSET_CMD=	${SED} -i '' -e '1s,^,\#${IDSTR1}${IDSTR2}\
 MASTER_SRCS!=	${MAKE} -C ${EN_DIR} -V SRCS
 
 ${DOC}.translate.xml:
-	@if [ "${TRAN_DIR}" == "${EN_DIR}" ]; then \
-		${ECHO} "build PO file in a non-English dir" ; \
-		exit 1 ; \
-	 fi
+.if ${TRAN_DIR} == ${EN_DIR}
+	@${ECHO} "build PO file in a non-English dir, ignored"
+.else
 	# 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
@@ -54,9 +53,16 @@ ${DOC}.translate.xml:
 	@${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET}
 	@${RM} ${.TARGET}.tmp
 	@${MAKE} -C ${EN_DIR} clean > /dev/null
+.endif
 
+.if ${TRAN_DIR} == ${EN_DIR}
+po:
+.else
 po: ${PO_LANG}.po
+.endif
+
 .PHONY:	po
+
 ${PO_LANG}.po:	${DOC}.translate.xml
 	@${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml
 	@( if [ -f "${PO_LANG}.po" ]; then \