From owner-svn-doc-projects@FreeBSD.ORG Wed May 15 13:40:52 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 13A50314; Wed, 15 May 2013 13:40:52 +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 06F9FE7E; Wed, 15 May 2013 13:40:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FDepmX045126; Wed, 15 May 2013 13:40:51 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FDepMN045125; Wed, 15 May 2013 13:40:51 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201305151340.r4FDepMN045125@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 15 May 2013 13:40:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41630 - 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:52 -0000 Author: gabor Date: Wed May 15 13:40:51 2013 New Revision: 41630 URL: http://svnweb.freebsd.org/changeset/doc/41630 Log: - Properly support EXTRA_CATALOGS (they are now XML catalogs) Modified: projects/xml-tools/share/mk/doc.xml.mk Modified: projects/xml-tools/share/mk/doc.xml.mk ============================================================================== --- projects/xml-tools/share/mk/doc.xml.mk Wed May 15 13:40:06 2013 (r41629) +++ projects/xml-tools/share/mk/doc.xml.mk Wed May 15 13:40:51 2013 (r41630) @@ -6,6 +6,9 @@ XML_CATALOG_FILES= file://${.OBJDIR}/cat file://${DOC_PREFIX}/share/xml/catalog.xml \ file://${DOC_PREFIX}/share/xml/catalog-common.xml \ file://${LOCALBASE}/share/xml/catalog +.if defined(EXTRA_CATALOGS) +XML_CATALOG_FILES+= ${EXTRA_CATALOGS} +.endif .if exists(${DOC_PREFIX}/share/xml/catalog-cwd.xml) XML_CATALOG_CWD= ${DOC_PREFIX}/share/xml/catalog-cwd.xml