From cd3acb75718dfd42dd25d58b4e7bd4db27b659d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 14 Sep 2016 18:33:42 +0900 Subject: [PATCH] Use --with-xorg-conf-dir=$prefix/share/X11/xorg.conf.d by default 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. --- 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"])