summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-09-14 15:49:01 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-14 16:03:18 +1000
commitb6f5c54fc61588c638b987bde914b0e5ff9b655e (patch)
treed9a3d7dcb5931bef01e47ab7e6f77be99733943a
parent23dc4678e9333ba0ee1a5374521905fa3f4f309c (diff)
xfree86: Change default font path to match configure.ac's --default-font-path.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/xfree86/Makefile.am7
-rw-r--r--hw/xfree86/xorgconf.cpp12
2 files changed, 5 insertions, 14 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index b97ebd79f..48db5a14c 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -109,12 +109,7 @@ endif
CPP_FILES_FLAGS = \
$(MANDEFS) \
- -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
- -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
- -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
- -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
- -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
- -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
+ -DDEFAULTFONTPATH="\"$(COMPILEDDEFAULTFONTPATH)\"" \
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink:
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index d880180ae..8ba9ae668 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -43,14 +43,10 @@ Section "Files"
XCOMM Multiple FontPath entries are allowed (which are concatenated together),
XCOMM as well as specifying multiple comma-separated entries in one FontPath
-XCOMM command (or a combination of both methods)
-
- FontPath LOCALFONTPATH
- FontPath MISCFONTPATH
- FontPath T1FONTPATH
- FontPath TRUETYPEFONTPATH
- FontPath DPI75FONTPATH
- FontPath DPI100FONTPATH
+XCOMM command (or a combination of both methods).
+XCOMM The default path is shown here.
+
+XCOMM FontPath DEFAULTFONTPATH
XCOMM ModulePath can be used to set a search path for the X server modules.
XCOMM The default path is shown here.