diff options
| author | markd <markd@pkgsrc.org> | 2012-12-15 21:21:27 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2012-12-15 21:21:27 +0000 |
| commit | 302b94aca2b5231b34097c23db4383b0b8a72985 (patch) | |
| tree | 57f6c6b2ae584dcc0bb4c0c1415acaf76a514d5d /mk | |
| parent | ee0a452e51f3c345e7ab55dd2a2fa9093db85096 (diff) | |
| download | pkgsrc-302b94aca2b5231b34097c23db4383b0b8a72985.tar.gz | |
Set X11_ENCODINGSDIR correctly for builtin case as well as modular.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 46beee81b62..26e60469c2b 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.328 2012/12/09 20:21:18 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.329 2012/12/15 21:21:27 markd Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -578,7 +578,11 @@ X11BASE= ${LOCALBASE} X11PREFIX= ${LOCALBASE} # Default directory for font encodings +.if ${X11_TYPE} == "modular" X11_ENCODINGSDIR?= ${X11BASE}/share/fonts/X11/encodings +.else +X11_ENCODINGSDIR?= ${X11BASE}/lib/X11/fonts/encodings +.endif IMAKE_MAN_SOURCE_PATH= man/man IMAKE_MAN_SUFFIX= 1 |