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

Change hardcoded /usr/X11R6 to PROJECTROOT. Change hardcoded XF86Config to 

XCONFIGFILE.
This commit is contained in:
Alan Coopersmith 2005-05-28 00:08:03 +00:00
parent 1cb18a4bad
commit cebd7348d2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/xfree86/utils/xorgconfig/xorgconfig.c
View File

@ -127,14 +127,6 @@ static int getuid() { return 0; }
*/ */
#define XFREE86_VERSION 400 #define XFREE86_VERSION 400
/*
* This is the filename of the temporary XF86Config file that is written
* when the program is told to probe clocks (which can only happen for
* root).
*/
#define TEMPORARY_XF86CONFIG_DIR_PREFIX "/tmp/.xf86config"
#define TEMPORARY_XF86CONFIG_FILENAME "XF86Config.tmp"
/* /*
* Define this to have /etc/X11/XF86Config prompted for as the default * Define this to have /etc/X11/XF86Config prompted for as the default
* location to write the XF86Config file to. * location to write the XF86Config file to.
@ -155,11 +147,6 @@ static int getuid() { return 0; }
#define DUMBCONFIG2 "dumbconfig.2" #define DUMBCONFIG2 "dumbconfig.2"
#define DUMBCONFIG3 "dumbconfig.3" #define DUMBCONFIG3 "dumbconfig.3"
#ifndef __UNIXOS2__
#define XSERVERNAME_FOR_PROBE "X"
#else
#define XSERVERNAME_FOR_PROBE "/usr/X11R6/bin/"__XSERVERNAME__
#endif
/* some more vars to make path names in texts more flexible. OS/2 users /* some more vars to make path names in texts more flexible. OS/2 users
* may be more irritated than Unix users * may be more irritated than Unix users
@ -182,11 +169,25 @@ static int getuid() { return 0; }
#endif #endif
#define MODULEPATH TREEROOT "/lib/modules" #define MODULEPATH TREEROOT "/lib/modules"
#ifndef __UNIXOS2__
#define XSERVERNAME_FOR_PROBE "X"
#else
#define XSERVERNAME_FOR_PROBE PROJECTROOT"/bin/"__XSERVERNAME__
#endif
#ifndef XCONFIGFILE #ifndef XCONFIGFILE
#define XCONFIGFILE "XF86Config" #define XCONFIGFILE "XF86Config"
#endif #endif
#define CONFIGNAME XCONFIGFILE #define CONFIGNAME XCONFIGFILE
/*
* This is the filename of the temporary XF86Config file that is written
* when the program is told to probe clocks (which can only happen for
* root).
*/
#define TEMPORARY_XF86CONFIG_DIR_PREFIX "/tmp/."XCONFIGFILE
#define TEMPORARY_XF86CONFIG_FILENAME XCONFIGFILE".tmp"
#ifndef XF86_VERSION_MAJOR #ifndef XF86_VERSION_MAJOR
#ifdef XVERSION #ifdef XVERSION
#if XVERSION > 40000000 #if XVERSION > 40000000