diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-09-16 18:01:41 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel.daenzer@amd.com> | 2016-09-16 18:01:41 +0900 |
| commit | 82062157263d6f63ce8f645bf32101fd18bd98e5 (patch) | |
| tree | 532e61af07c394bcf7f3ddbb52936d5d590e3925 /configure.ac | |
| parent | 6eb2b507d9ec8dcde2482a5ebf59c001933e10ea (diff) | |
Fix handling of configure option --with-xorg-conf-dir
There were two problems:
I accidentally changed the variable name in the AC_ARG_WITH stanza from
configdir to xorgconfigdir, so specifying --with-xorg-conf-dir wouldn't
work correctly. Fix this back to configdir.
If neither --with-xorg-conf-dir nor --prefix is specified on the command
line, the $prefix variable doesn't contain "/usr/local" (the default
prefix) yet at this point but "NONE". So make install would attempt to
install 10-amdgpu.conf in ${DESTDIR}NONE/share/X11/xorg.conf.d/ . Fix
this by leaving ${prefix} verbatim in the default value, to be resolved
by make.
Also print the configdir value along with the values of other similar
configuration variables.
Reported-by: Timo Aaltonen <tjaalton@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
(Cherry picked from commit aa8a3fa2468094cd37959179e8417ba7ba0a326c)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ed45aaa..ff6a368 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=$prefix/share/X11/xorg.conf.d/]]]), - [xorgconfdir="$withval"], - [xorgconfdir="$prefix/share/X11/xorg.conf.d"]) + [Default xorg.conf.d directory [[default=${prefix}/share/X11/xorg.conf.d]]]), + [configdir="$withval"], + [configdir='${prefix}/share/X11/xorg.conf.d']) AC_SUBST(configdir) AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) @@ -279,6 +279,7 @@ echo " prefix: $prefix" echo " exec_prefix: $exec_prefix" echo " libdir: $libdir" echo " includedir: $includedir" +echo " configdir: $configdir" echo "" echo " CFLAGS: $CFLAGS" |