diff options
| author | hira <hira@pkgsrc.org> | 2005-09-05 15:18:42 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2005-09-05 15:18:42 +0000 |
| commit | 217f67e27dd6c18c327e8bbc250d58a58aee9a73 (patch) | |
| tree | 80c0cb62c07d485d88f66be7f63de18ec6359d4b /fonts | |
| parent | b9e2be8fbdb69ec6e864ba003f026729c31690bf (diff) | |
| download | pkgsrc-217f67e27dd6c18c327e8bbc250d58a58aee9a73.tar.gz | |
Clean up additional font path. OK'd by reed@.
If you installed fontconfig-2.3.2, please remove <dir></dir> entry
from ${LOCALBASE}/etc/fontconfig/fonts.conf.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/fontconfig/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 3d257b0bd62..5aa1aef07f8 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/07/28 16:40:03 reed Exp $ +# $NetBSD: Makefile,v 1.45 2005/09/05 15:18:42 hira Exp $ # DISTNAME= fontconfig-2.3.2 @@ -35,13 +35,9 @@ CONFIGURE_ENV+= HASDOCBOOK=no .include "../../mk/bsd.prefs.mk" -.if defined($X11PREFIX) && (${LOCALBASE} != {$X11PREFIX}) -FONT_PATH= ${X11PREFIX}/lib/X11/fonts +.if (${X11BASE} != ${LOCALBASE}) +CONFIGURE_ARGS+= --with-add-fonts=${X11BASE}/lib/X11/fonts .endif -.if (${X11PREFIX} != ${X11BASE}) -FONT_PATH2= ,${X11BASE}/lib/X11/fonts -.endif -CONFIGURE_ARGS+= --with-add-fonts=${FONT_PATH}${FONT_PATH2} EGDIR= ${PREFIX}/share/examples/fontconfig CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf |