frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alan Coopersmith 2009-09-14 15:49:01 +10:00 committed by Peter Hutterer
parent 23dc4678e9
commit b6f5c54fc6
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/Makefile.am
View File

@ -109,12 +109,7 @@ endif
CPP_FILES_FLAGS = \ CPP_FILES_FLAGS = \
$(MANDEFS) \ $(MANDEFS) \
-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ -DDEFAULTFONTPATH="\"$(COMPILEDDEFAULTFONTPATH)\"" \
-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\"" \
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink: relink:

10
hw/xfree86/xorgconf.cpp
View File

@ -43,14 +43,10 @@ Section "Files"
XCOMM Multiple FontPath entries are allowed (which are concatenated together), XCOMM Multiple FontPath entries are allowed (which are concatenated together),
XCOMM as well as specifying multiple comma-separated entries in one FontPath XCOMM as well as specifying multiple comma-separated entries in one FontPath
XCOMM command (or a combination of both methods) XCOMM command (or a combination of both methods).
XCOMM The default path is shown here.
FontPath LOCALFONTPATH XCOMM FontPath DEFAULTFONTPATH
FontPath MISCFONTPATH
FontPath T1FONTPATH
FontPath TRUETYPEFONTPATH
FontPath DPI75FONTPATH
FontPath DPI100FONTPATH
XCOMM ModulePath can be used to set a search path for the X server modules. XCOMM ModulePath can be used to set a search path for the X server modules.
XCOMM The default path is shown here. XCOMM The default path is shown here.