From owner-svn-doc-projects@FreeBSD.ORG Wed May 15 13:40:07 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 705AD285; Wed, 15 May 2013 13:40:07 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 62A6EE68; Wed, 15 May 2013 13:40:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FDe7oR043551; Wed, 15 May 2013 13:40:07 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FDe71j043550; Wed, 15 May 2013 13:40:07 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201305151340.r4FDe71j043550@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 15 May 2013 13:40:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41629 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 13:40:07 -0000 Author: gabor Date: Wed May 15 13:40:06 2013 New Revision: 41629 URL: http://svnweb.freebsd.org/changeset/doc/41629 Log: - The old LANGCODE detection was bogus and did not work properly with release notes. Use a different approach that works. Modified: projects/xml-tools/share/mk/doc.common.mk Modified: projects/xml-tools/share/mk/doc.common.mk ============================================================================== --- projects/xml-tools/share/mk/doc.common.mk Tue May 14 14:06:32 2013 (r41628) +++ projects/xml-tools/share/mk/doc.common.mk Wed May 15 13:40:06 2013 (r41629) @@ -20,20 +20,8 @@ DOC_PREFIX_NAME?= head .endif .if (!defined(LANGCODE) || empty(LANGCODE)) -# Calculate _LANGCODE. -_LANGCODE:= ${.CURDIR} -. for _ in 1 2 3 4 5 6 7 8 9 10 -. if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME}) -_LANGCODE:= ${_LANGCODE:H} -. endif -. endfor -_LANGCODE:= ${_LANGCODE:T} -.else # (!defined(LANGCODE) || empty(LANGCODE)) -# when LANGCODE is defined, use the value. -_LANGCODE?= ${LANGCODE} -.endif # (!defined(LANGCODE) || empty(LANGCODE)) - -LANGCODE?= ${_LANGCODE} +LANGCODE!= echo ${.CURDIR} | grep -o '[a-z]*_[A-Z]*\.[-A-Za-z0-9]*' || true +.endif # normalize DOC_PREFIX DOC_PREFIX!= ${REALPATH} ${DOC_PREFIX}