diff options
| author | dsainty <dsainty@pkgsrc.org> | 2006-10-12 08:34:56 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2006-10-12 08:34:56 +0000 |
| commit | 0e6339d5140be8c3a7387815db19ad6eaab9b181 (patch) | |
| tree | 2779fedb14408921b1813e8a763c2bcf56c6cd28 /textproc | |
| parent | 86a357d2f86ffa37bcf2a70711bfcd0957b6d2b6 (diff) | |
| download | pkgsrc-0e6339d5140be8c3a7387815db19ad6eaab9b181.tar.gz | |
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 (limited to 'textproc')
| -rw-r--r-- | textproc/xmlcatmgr/catalogs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index b6931067ecb..9cbbabf6b5f 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -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 @@ XML_ENTRIES?= # 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 |