[PATCH xf86-video-amdgpu] Use --with-xorg-conf-dir=$prefix/share/X11/xorg.conf.d by default

Michel Dänzer michel at daenzer.net
Wed Sep 14 09:35:44 UTC 2016


From: Michel Dänzer <michel.daenzer at amd.com>

We were using the result of `pkg-config --variable=sysconfigdir
xorg-server` before, which may not be inside $prefix, so make install
might fail for 10-amdgpu.conf .

Fixes make distcheck in that case, and possibly also 10-amdgpu.conf
seemingly missing from some distribution packages.

This matches what some (though not all) input drivers are doing for their
xorg.conf.d snippets.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd5905f..9166c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,9 @@ PKG_CHECK_EXISTS([xorg-server >= 1.16],
 		 [sysconfigdir=""])
 AC_ARG_WITH(xorg-conf-dir,
             AS_HELP_STRING([--with-xorg-conf-dir=DIR],
-                           [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]),
-            [configdir="$withval"],
-            [configdir="$sysconfigdir"])
+                           [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
+            [xorgconfdir="$withval"],
+            [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
 AC_SUBST(configdir)
 AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
 
-- 
2.9.3



More information about the amd-gfx mailing list