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

Allow hard-coded paths to be configurable.

This commit is contained in:
Kevin E Martin 2005-12-08 17:54:40 +00:00
parent 20c0ebe7b3
commit 39189c2b86
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/utils/xorgcfg/loader.c
View File

@ -54,6 +54,10 @@
#include <stdarg.h> #include <stdarg.h>
#ifndef OPTIONSPATH
#define OPTIONSPATH "/usr/X11R6/lib/X11"
#endif
#ifndef SIGNALRETURNSINT #ifndef SIGNALRETURNSINT
void sig_handler(int); void sig_handler(int);
#else #else
@ -188,7 +192,7 @@ LoaderInitializeOptions(void)
first = 0; first = 0;
checkerLegend[CHECKER_OPTIONS_FILE_MISSING] = checkerLegend[CHECKER_OPTIONS_FILE_MISSING] =
"The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n"; "The Options file, normally " OPTIONSPATH "/Options was not found.\n";
checkerLegend[CHECKER_OPTION_DESCRIPTION_MISSING] = checkerLegend[CHECKER_OPTION_DESCRIPTION_MISSING] =
"No description for the module option. The description should be in\n" "No description for the module option. The description should be in\n"
"in the Options file, and using the sintax:\n" "in the Options file, and using the sintax:\n"

4
hw/xfree86/utils/xorgcfg/text-mode.c
View File

@ -55,11 +55,13 @@
#define PROJECT_ROOT "/usr/X11R6" #define PROJECT_ROOT "/usr/X11R6"
#endif #endif
#ifndef XKB_RULES_DIR
#ifndef __UNIXOS2__ #ifndef __UNIXOS2__
#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules" #define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
#else #else
#define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules" #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
#endif #endif
#endif
#define CONTROL_A 1 #define CONTROL_A 1
#define CONTROL_D 4 #define CONTROL_D 4
@ -214,7 +216,7 @@ TextMode(void)
"sample "__XCONFIGFILE__" file is supplied with " "sample "__XCONFIGFILE__" file is supplied with "
#else #else
#ifndef __UNIXOS2__ #ifndef __UNIXOS2__
"The "__XCONFIGFILE__" file usually resides in /usr/X11R6/etc/X11 " "The "__XCONFIGFILE__" file usually resides in " PROJECT_ROOT "/etc/X11 "
#else #else
"The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" " "The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" "
#endif #endif