Move the definition of XMLCATMGR, SGML_DEFAULT_CATALOG and XML_DEFAULT_CATALOG

variables from the catalogs.mk file to buildlink2.mk.  These may be needed in
a package that does *not* provide catalog files (i.e., all the functionality
in catalogs.mk is not required).

2 files changed, 22 insertions, 24 deletions

diff --git a/textproc/xmlcatmgr/buildlink2.mk b/textproc/xmlcatmgr/buildlink2.mk
index 7977f70b661..a259314e0ba 100644
--- a/textproc/xmlcatmgr/buildlink2.mk
+++ b/textproc/xmlcatmgr/buildlink2.mk
@@ -1,8 +1,15 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/29 20:21:07 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/07/22 18:25:09 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
-# This file was created automatically using createbuildlink 2.3.
+# The following variables are automatically defined for free use in packages:
+#    XMLCATMGR            - Path to the xmlcatmgr program.
+#    SGML_DEFAULT_CATALOG - Path to the system-wide (tunable) SGML catalog.
+#    XML_DEFAULT_CATALOG  - Path to the system-wide (tunable) XML catalog.
+#
+# Packages that recognize a system-wide catalog file should be configured
+# to use SGML_DEFAULT_CATALOG or XML_DEFAULT_CATALOG, depending on the
+# type of tool they are.
 #
 
 .if !defined(XMLCATMGR_BUILDLINK2_MK)
@@ -17,6 +24,18 @@ BUILDLINK_PREFIX.xmlcatmgr_DEFAULT=	${LOCALBASE}
 
 BUILDLINK_TARGETS+=	xmlcatmgr-buildlink
 
+# Location of the xmlcatmgr binary program.
+XMLCATMGR=	${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr
+
+# System-wide configurable catalogs.
+.if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
+SGML_DEFAULT_CATALOG=	${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog
+XML_DEFAULT_CATALOG=	${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog
+.else
+SGML_DEFAULT_CATALOG=	${PKG_SYSCONFBASE}/sgml/catalog
+XML_DEFAULT_CATALOG=	${PKG_SYSCONFBASE}/xml/catalog
+.endif
+
 xmlcatmgr-buildlink: _BUILDLINK_USE
 
 .endif	# XMLCATMGR_BUILDLINK2_MK
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index 76eeb7d46fe..cf8767ba617 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,18 +1,9 @@
-# $NetBSD: catalogs.mk,v 1.1 2003/01/29 20:21:07 jmmv Exp $
+# $NetBSD: catalogs.mk,v 1.2 2003/07/22 18:25:09 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
 # database.
 #
-# The following variables are automatically defined for free use in packages:
-#    XMLCATMGR            - Path to the xmlcatmgr program.
-#    SGML_DEFAULT_CATALOG - Path to the system-wide (tunable) SGML catalog.
-#    XML_DEFAULT_CATALOG  - Path to the system-wide (tunable) XML catalog.
-#
-# Packages that recognize a system-wide catalog file should be configured
-# to use SGML_DEFAULT_CATALOG or XML_DEFAULT_CATALOG, depending on the
-# type of tool they are.
-#
 # The following variables can be defined by a package to automatically
 # register catalog files:
 #    SGML_CATALOGS - List of SGML catalogs to register into share/sgml/catalog.
@@ -28,18 +19,6 @@
 .if !defined(XMLCATMGR_CATALOGS_MK)
 XMLCATMGR_CATALOGS_MK=	# defined
 
-# Location of the xmlcatmgr binary program.
-XMLCATMGR=	${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr
-
-# System-wide configurable catalogs.
-.if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
-SGML_DEFAULT_CATALOG=	${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog
-XML_DEFAULT_CATALOG=	${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog
-.else
-SGML_DEFAULT_CATALOG=	${PKG_SYSCONFBASE}/sgml/catalog
-XML_DEFAULT_CATALOG=	${PKG_SYSCONFBASE}/xml/catalog
-.endif
-
 # Catalogs to be registered.
 SGML_CATALOGS?=
 XML_CATALOGS?=