[pkgsrc/trunk]: pkgsrc/textproc/xmlcatmgr Don't pretend to automatically add ...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00aebb5e950b
branches:  trunk
changeset: 519878:00aebb5e950b
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Thu Oct 12 08:34:56 2006 +0000

description:
Don't pretend to automatically add ${PREFIX} to each XML_ENTRIES and
SGML_ENTRIES entry - it doesn't work.  Probably because expansion
in this context requires the variable to already be defined, which it
isn't.

This is lucky, because every package using catalogs.mk adds ${PREFIX}
itself to each entry.  So usually it gets added just the once.

The luck stops if you do something like: make PREFIX=/usr/pkgroot2

This makes the automatic ${PREFIX} insertion suddenly work AS WELL as
the client packages adding ${PREFIX} themselves.  We end up with
/usr/pkgroot2/share/xml/catalog containing lines like:

<nextCatalog catalog="/usr/pkgroot2/usr/pkgroot2/share/xml/docbook/4.3/catalog" />

... after installing textproc/docbook-xml.  This in turn causes
textproc/scrollkeeper to obscurely fail to build at configure time.

diffstat:

 textproc/xmlcatmgr/catalogs.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 77d05f965a45 -r 00aebb5e950b textproc/xmlcatmgr/catalogs.mk
--- a/textproc/xmlcatmgr/catalogs.mk    Thu Oct 12 06:06:07 2006 +0000
+++ b/textproc/xmlcatmgr/catalogs.mk    Thu Oct 12 08:34:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.16 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: catalogs.mk,v 1.17 2006/10/12 08:34:56 dsainty 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
@@ -32,14 +32,14 @@
 # Convert SGML_CATALOGS files into arguments for SGML_ENTRIES.
 .if !empty(SGML_CATALOGS)
 .  for c in ${SGML_CATALOGS}
-SGML_ENTRIES+= CATALOG ${PREFIX:=${c}} --
+SGML_ENTRIES+= CATALOG ${c} --
 .  endfor
 .endif
 
 # Convert XML_CATALOGS files into arguments for XML_ENTRIES.
 .if !empty(XML_CATALOGS)
 .  for c in ${XML_CATALOGS}
-XML_ENTRIES+=  nextCatalog ${PREFIX:=${c}} --
+XML_ENTRIES+=  nextCatalog ${c} --
 .  endfor
 .endif