diff options
| author | agc <agc> | 2003-12-20 19:49:01 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-12-20 19:49:01 +0000 |
| commit | de2757b9ec98bbd741fd37c5fa4a493fdab10d1e (patch) | |
| tree | df26a51e3e85a4c39cbd15ec5365f271d20fb448 /fonts/fontconfig/Makefile | |
| parent | a8146c01046946e7a31c5a10ba6f5de363a80628 (diff) | |
| download | pkgsrc-de2757b9ec98bbd741fd37c5fa4a493fdab10d1e.tar.gz | |
Pullup correct operation fix to the pkgsrc-2003Q4 branch, requested by
Ingolf Steinbach.
revision 1.19
date: 2003/12/04 23:28:10; author: dmcmahill; state: Exp; lines: +7 -2
If X11PREFIX and X11BASE are not the same, which happens with xpkgwedge,
then add both to the font path instead of just X11PREFIX. Makes this pkg
work with xpkgwedge.
Diffstat (limited to 'fonts/fontconfig/Makefile')
| -rw-r--r-- | fonts/fontconfig/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 81d5aeb1d45..3979d48ae1b 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/10/29 05:45:15 reed Exp $ +# $NetBSD: Makefile,v 1.18.2.1 2003/12/20 19:49:01 agc Exp $ # DISTNAME= fontconfig-2.2.1 @@ -32,7 +32,12 @@ CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-x -CONFIGURE_ARGS+= --with-add-fonts=${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1 +FONT_PATH= ${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1 +.include "../../mk/bsd.prefs.mk" +.if ${X11BASE} != ${X11PREFIX} +FONT_PATH2= ,${X11BASE}/lib/X11/fonts,${X11BASE}/lib/X11/fonts/TTF,${X11BASE}/lib/X11/fonts/Type1 +.endif +CONFIGURE_ARGS+= --with-add-fonts=${FONT_PATH}${FONT_PATH2} EGDIR= ${PREFIX}/share/examples/fontconfig CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf |