Create xorg.conf.example (Gentoo bug #138623).
This commit is contained in:
parent
d029c8f1b7
commit
c5dc997baf
|
@ -836,6 +836,7 @@ VENDOR_MAN_VERSION="Version ${VENDOR_VERSION_STRING}"
|
||||||
|
|
||||||
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
|
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
|
||||||
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
|
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
|
||||||
|
AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
|
||||||
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
|
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
|
||||||
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
|
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
|
||||||
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
|
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
include $(top_srcdir)/cpprules.in
|
||||||
|
|
||||||
if DRI
|
if DRI
|
||||||
DRI_SUBDIR = dri
|
DRI_SUBDIR = dri
|
||||||
endif
|
endif
|
||||||
|
@ -82,7 +84,23 @@ endif
|
||||||
optionsdir = $(libdir)/X11
|
optionsdir = $(libdir)/X11
|
||||||
dist_options_DATA = Options
|
dist_options_DATA = Options
|
||||||
|
|
||||||
|
BUILT_SOURCES = xorg.conf.example
|
||||||
|
CLEAN = xorg.conf.example xorg.conf.example.pre
|
||||||
EXTRA_DIST = xorgconf.cpp
|
EXTRA_DIST = xorgconf.cpp
|
||||||
|
|
||||||
|
CPP_FILES_FLAGS = \
|
||||||
|
-DRGBPATH=\"$(RGB_DB)\" \
|
||||||
|
-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
|
||||||
|
-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
|
||||||
|
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
|
||||||
|
-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
|
||||||
|
-DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
|
||||||
|
-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
|
||||||
|
-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
|
||||||
|
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
|
||||||
|
|
||||||
relink:
|
relink:
|
||||||
rm -f Xorg && $(MAKE) Xorg
|
rm -f Xorg && $(MAKE) Xorg
|
||||||
|
|
||||||
|
xorg.conf.example.pre: xorgconf.cpp
|
||||||
|
cp $< $@
|
||||||
|
|
|
@ -54,12 +54,9 @@ XCOMM command (or a combination of both methods)
|
||||||
|
|
||||||
FontPath LOCALFONTPATH
|
FontPath LOCALFONTPATH
|
||||||
FontPath MISCFONTPATH
|
FontPath MISCFONTPATH
|
||||||
FontPath DPI75USFONTPATH
|
|
||||||
FontPath DPI100USFONTPATH
|
|
||||||
FontPath T1FONTPATH
|
FontPath T1FONTPATH
|
||||||
FontPath TRUETYPEFONTPATH
|
FontPath TRUETYPEFONTPATH
|
||||||
FontPath CIDFONTPATH
|
FontPath CIDFONTPATH
|
||||||
FontPath SPFONTPATH
|
|
||||||
FontPath DPI75FONTPATH
|
FontPath DPI75FONTPATH
|
||||||
FontPath DPI100FONTPATH
|
FontPath DPI100FONTPATH
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user