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

xfree86: Set a saner search path for xorg.conf.d 

There's no reason to carry all the oddities from xorg.conf like appended
hostname to the search path for xorg.conf.d. This changes it to something
very simple:

	/etc/X11/<cmdline>
	$sysconfdir/X11/<cmdline>
	/etc/X11/xorg.conf.d
	$sysconfdir/X11/xorg.conf.d

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dan Nicholson 2010-04-03 09:33:49 -07:00 committed by Peter Hutterer
parent 2ac33888a9
commit a1bae63dc6
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpprules.in
View File

@ -34,6 +34,7 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \ -D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \ -D__projectroot__=$(prefix) \
-D__sysconfdir__=$(sysconfdir) \
-D__datadir__=$(datadir) \ -D__datadir__=$(datadir) \
-D__xconfigfile__=$(__XCONFIGFILE__) \ -D__xconfigfile__=$(__XCONFIGFILE__) \
-D__xconfigdir__=$(__XCONFIGDIR__) \ -D__xconfigdir__=$(__XCONFIGDIR__) \

16
hw/xfree86/common/xf86Config.c
View File

@ -97,20 +97,12 @@ extern DeviceAssocRec mouse_assoc;
#endif #endif
#ifndef ROOT_CONFIGDIRPATH #ifndef ROOT_CONFIGDIRPATH
#define ROOT_CONFIGDIRPATH "%A," "%R," \ #define ROOT_CONFIGDIRPATH "%A," "%R," \
"/etc/X11/%R," "%P/etc/X11/%R," \ "/etc/X11/%R," "%C/X11/%R," \
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "/etc/X11/%X," "%C/X11/%X"
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
"%P/etc/X11/%X," \
"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
"%P/lib/X11/%X"
#endif #endif
#ifndef USER_CONFIGDIRPATH #ifndef USER_CONFIGDIRPATH
#define USER_CONFIGDIRPATH "/etc/X11/%S," "%P/etc/X11/%S," \ #define USER_CONFIGDIRPATH "/etc/X11/%R," "%C/X11/%R," \
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "/etc/X11/%X," "%C/X11/%X"
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
"%P/etc/X11/%X," \
"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
"%P/lib/X11/%X"
#endif #endif
#ifndef PROJECTROOT #ifndef PROJECTROOT
#define PROJECTROOT "/usr/X11R6" #define PROJECTROOT "/usr/X11R6"

22
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -107,16 +107,9 @@ directories when the server is started as a normal user:
.RS 4 .RS 4
.nf .nf
.IR /etc/X11/ <cmdline> .IR /etc/X11/ <cmdline>
.IR __projectroot__/etc/X11/ <cmdline> .IR __sysconfdir__/X11/ <cmdline>
.I /etc/X11/__xconfigdir__\-4
.I /etc/X11/__xconfigdir__ .I /etc/X11/__xconfigdir__
.I /etc/__xconfigdir__ .I __sysconfdir__/X11/__xconfigdir__
.IR __projectroot__/etc/X11/__xconfigdir__. <hostname>
.I __projectroot__/etc/X11/__xconfigdir__\-4
.I __projectroot__/etc/X11/__xconfigdir__
.IR __projectroot__/lib/X11/__xconfigdir__. <hostname>
.I __projectroot__/lib/X11/__xconfigdir__\-4
.I __projectroot__/lib/X11/__xconfigdir__
.fi .fi
.RE .RE
.PP .PP
@ -133,16 +126,9 @@ config directory search locations are as follows:
.nf .nf
<cmdline> <cmdline>
.IR /etc/X11/ <cmdline> .IR /etc/X11/ <cmdline>
.IR __projectroot__/etc/X11/ <cmdline> .IR __sysconfdir__/X11/ <cmdline>
.I /etc/X11/__xconfigdir__\-4
.I /etc/X11/__xconfigdir__ .I /etc/X11/__xconfigdir__
.I /etc/__xconfigdir__ .I __sysconfdir__/X11/__xconfigdir__
.IR __projectroot__/etc/X11/__xconfigdir__. <hostname>
.I __projectroot__/etc/X11/__xconfigdir__\-4
.I __projectroot__/etc/X11/__xconfigdir__
.IR __projectroot__/lib/X11/__xconfigdir__. <hostname>
.I __projectroot__/lib/X11/__xconfigdir__\-4
.I __projectroot__/lib/X11/__xconfigdir__
.fi .fi
.RE .RE
.PP .PP