From b4228a464e971ec4fe3ab820735e33d427456400 Mon Sep 17 00:00:00 2001 From: jmmv Date: Tue, 29 Mar 2005 14:39:15 +0000 Subject: Use XMLCATMGR_PREFIX (defined in buildlink3.mk) rather than BUILDLINK_PREFIX.xmlcatmgr because the latter is not defined if NO_BUILD is set. Fixes problems seen by abs@ (docbook-xml's catalog not appearing in the system-wide catalog). --- textproc/xmlcatmgr/catalogs.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index b2b283dcdec..512ec4e98af 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.9 2005/03/24 22:42:59 jlam Exp $ +# $NetBSD: catalogs.mk,v 1.10 2005/03/29 14:39:15 jmmv Exp $ # # This Makefile fragment is intended to be included by packages that install # catalog files or DTDs. It takes care of registering them into the right @@ -47,8 +47,8 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=$c} -- # use bsd.pkg.install.mk. .if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) FILES_SUBST+= XMLCATMGR="${XMLCATMGR}" -FILES_SUBST+= SGML_CATALOG="${BUILDLINK_PREFIX.xmlcatmgr}/share/sgml/catalog" -FILES_SUBST+= XML_CATALOG="${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog" +FILES_SUBST+= SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog" +FILES_SUBST+= XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog" FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q} FILES_SUBST+= XML_ENTRIES=${XML_ENTRIES:Q} INSTALL_EXTRA_TMPL+= ../../textproc/xmlcatmgr/files/install.tmpl -- cgit v1.2.3