[PATCH v2] xfree86: Only support one sysconfigdir

[Peter Hutterer]

On Fri, Jul 11, 2014 at 03:56:35PM -0700, Aaron Plattner wrote:
> 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 at nvidia.com>
> ---
> Here's version 2 that just drops the /usr/share hardcode.

Thanks, I've merged this in my tree and will send it to Keith asap.

Cheers,
   Peter

> 
>  hw/xfree86/common/xf86Config.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
> index 481674de2955..779ba6f7c7d8 100644
> --- a/hw/xfree86/common/xf86Config.c
> +++ b/hw/xfree86/common/xf86Config.c
> @@ -103,7 +103,7 @@
>  					"/etc/X11/%X," "%C/X11/%X"
>  #endif
>  #ifndef SYS_CONFIGDIRPATH
> -#define SYS_CONFIGDIRPATH	"/usr/share/X11/%X," "%D/X11/%X"
> +#define SYS_CONFIGDIRPATH	"%D/X11/%X"
>  #endif
>  #ifndef PROJECTROOT
>  #define PROJECTROOT	"/usr/X11R6"
> -- 
> 2.0.1
>