diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-09-15 15:28:12 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel.daenzer@amd.com> | 2016-09-15 15:28:12 +0900 |
| commit | 8761c46babe0ec01da784dd27db3dd9e769acbca (patch) | |
| tree | 3233246c0bc2505f57fa99461821902f9a5df20b | |
| parent | ca1cf24d4eb773f7380c0da3fa942a5c85074422 (diff) | |
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.
(Cherry picked from commit cd3acb75718dfd42dd25d58b4e7bd4db27b659d8)
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 824467d..9d646f1 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"]) |