summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-12-03 03:33:25 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-12-03 03:33:25 +0000
commitb3bf0ef296436a023ebd42ed4a399ede91e48379 (patch)
tree8d0dd70fa9de831442c6da2e82efd0c5df397bff
parente2ad12f41fca253c5d55614df509744a8a707ee1 (diff)
xc/config/cf/X11.tmpl
//freedesktop.org/bugzilla/show_bug.cgi?id=2002): Make location of the encodings/ files configurable in the build system via adding a new |FontEncDir|-symbol to xc/config/cf/X11.tmpl (default value is |$(LIBDIR)/fonts/encodings|).
-rw-r--r--X11.tmpl7
1 files changed, 5 insertions, 2 deletions
diff --git a/X11.tmpl b/X11.tmpl
index 6fbd66a..5bd777c 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.36 2004/09/18 00:30:50 gisburn Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.37 2004/10/30 01:41:46 torrey Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -1513,6 +1513,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef FontDir
#define FontDir $(LIBDIR)/fonts
#endif
+#ifndef FontEncDir
+#define FontEncDir $(LIBDIR)/fonts/encodings
+#endif
#ifndef AdmDir
#define AdmDir /usr/adm
#endif
@@ -1680,7 +1683,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
DOCPSDIR = DocPsDir
DOCPDFDIR = DocPdfDir
FONTDIR = FontDir /* font directories */
- ENCODINGSDIR = $(FONTDIR)/encodings /* font encodings directory */
+ ENCODINGSDIR = FontEncDir /* font encodings directory */
XINITDIR = XinitDir /* xinit config files */
XDMDIR = XdmDir /* xdm config files */
XDMVARDIR = XdmVarDir /* xdm config files */