diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-08 17:54:40 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-08 17:54:40 +0000 |
| commit | 39189c2b86a4c2ab5f3f161d423eb072356668e5 (patch) | |
| tree | 4d69c903356a473726a79a770bab3db50719a774 | |
| parent | 20c0ebe7b3feb85abf9bf140b7799aafc6f59513 (diff) | |
Allow hard-coded paths to be configurable.
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/loader.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index 6fe59a1f1..98a661d89 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -54,6 +54,10 @@ #include <stdarg.h> +#ifndef OPTIONSPATH +#define OPTIONSPATH "/usr/X11R6/lib/X11" +#endif + #ifndef SIGNALRETURNSINT void sig_handler(int); #else @@ -188,7 +192,7 @@ LoaderInitializeOptions(void) first = 0; 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] = "No description for the module option. The description should be in\n" "in the Options file, and using the sintax:\n" diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 5be13b40a..3c6acce6e 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -55,11 +55,13 @@ #define PROJECT_ROOT "/usr/X11R6" #endif +#ifndef XKB_RULES_DIR #ifndef __UNIXOS2__ #define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules" #else #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules" #endif +#endif #define CONTROL_A 1 #define CONTROL_D 4 @@ -214,7 +216,7 @@ TextMode(void) "sample "__XCONFIGFILE__" file is supplied with " #else #ifndef __UNIXOS2__ - "The "__XCONFIGFILE__" file usually resides in /usr/X11R6/etc/X11 " + "The "__XCONFIGFILE__" file usually resides in " PROJECT_ROOT "/etc/X11 " #else "The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" " #endif |