xfree86: Only support one sysconfigdir
When the X server is compiled with --prefix set to something other than /usr, then it ends up with a nonstandard sysconfigdir in its .pc file. This causes various other components to install their xorg.conf.d snippets there. However, the X server first looks for /usr/share/X11/xorg.conf.d before looking in sysconfigdir. That means that if the system administrator installed anything that created that path, the user's custom sysconfigdir is not searched. Rather than doing that, just look in the configured sysconfdir and nowhere else. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
578b9283bc
commit
acc0b5edd1
|
@ -103,7 +103,7 @@
|
||||||
"/etc/X11/%X," "%C/X11/%X"
|
"/etc/X11/%X," "%C/X11/%X"
|
||||||
#endif
|
#endif
|
||||||
#ifndef SYS_CONFIGDIRPATH
|
#ifndef SYS_CONFIGDIRPATH
|
||||||
#define SYS_CONFIGDIRPATH "/usr/share/X11/%X," "%D/X11/%X"
|
#define SYS_CONFIGDIRPATH "%D/X11/%X"
|
||||||
#endif
|
#endif
|
||||||
#ifndef PROJECTROOT
|
#ifndef PROJECTROOT
|
||||||
#define PROJECTROOT "/usr/X11R6"
|
#define PROJECTROOT "/usr/X11R6"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user