diff options
| -rw-r--r-- | textproc/xmlcatmgr/catalogs.mk | 6 | ||||
| -rw-r--r-- | textproc/xmlcatmgr/files/deinstall.tmpl | 6 | ||||
| -rw-r--r-- | textproc/xmlcatmgr/files/install.tmpl | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index 77a2623de63..c5fa6d4d2a1 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.7 2004/04/28 07:11:44 wiz Exp $ +# $NetBSD: catalogs.mk,v 1.8 2004/05/06 14:39:05 minskim 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 @@ -49,8 +49,8 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=$c} -- 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_ENTRIES="${SGML_ENTRIES}" -FILES_SUBST+= XML_ENTRIES="${XML_ENTRIES}" +FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q} +FILES_SUBST+= XML_ENTRIES=${XML_ENTRIES:Q} INSTALL_EXTRA_TMPL+= ../../textproc/xmlcatmgr/files/install.tmpl DEINSTALL_EXTRA_TMPL+= ../../textproc/xmlcatmgr/files/deinstall.tmpl USE_PKGINSTALL= YES diff --git a/textproc/xmlcatmgr/files/deinstall.tmpl b/textproc/xmlcatmgr/files/deinstall.tmpl index c7e7045498a..0952ce76f89 100644 --- a/textproc/xmlcatmgr/files/deinstall.tmpl +++ b/textproc/xmlcatmgr/files/deinstall.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: deinstall.tmpl,v 1.4 2004/01/17 16:00:20 jmmv Exp $ +# $NetBSD: deinstall.tmpl,v 1.5 2004/05/06 14:39:05 minskim Exp $ # # Unregister SGML/XML catalog entries. # @@ -12,14 +12,14 @@ XML_ENTRIES='@XML_ENTRIES@' case ${STAGE} in DEINSTALL) if [ -n "${SGML_ENTRIES}" ]; then - set -- ${SGML_ENTRIES} + set -- @SGML_ENTRIES@ while [ $# -gt 0 ]; do ${XMLCATMGR} -sc ${SGML_CATALOG} remove "$1" "$2" shift; shift; shift done fi if [ -n "${XML_ENTRIES}" ]; then - set -- ${XML_ENTRIES} + set -- @XML_ENTRIES@ while [ $# -gt 0 ]; do ${XMLCATMGR} -c ${XML_CATALOG} remove "$1" "$2" shift; shift; shift diff --git a/textproc/xmlcatmgr/files/install.tmpl b/textproc/xmlcatmgr/files/install.tmpl index bc995eb27a4..4222f87b45a 100644 --- a/textproc/xmlcatmgr/files/install.tmpl +++ b/textproc/xmlcatmgr/files/install.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: install.tmpl,v 1.3 2003/09/08 12:26:22 jmmv Exp $ +# $NetBSD: install.tmpl,v 1.4 2004/05/06 14:39:05 minskim Exp $ # # Register SGML/XML catalog entries. # @@ -12,14 +12,14 @@ XML_ENTRIES='@XML_ENTRIES@' case ${STAGE} in POST-INSTALL) if [ -n "${SGML_ENTRIES}" ]; then - set -- ${SGML_ENTRIES} + set -- @SGML_ENTRIES@ while [ $# -gt 0 ]; do ${XMLCATMGR} -sc ${SGML_CATALOG} add "$1" "$2" "$3" shift; shift; shift done fi if [ -n "${XML_ENTRIES}" ]; then - set -- ${XML_ENTRIES} + set -- @XML_ENTRIES@ while [ $# -gt 0 ]; do ${XMLCATMGR} -c ${XML_CATALOG} add "$1" "$2" "$3" shift; shift; shift |