summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-10 03:34:38 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-10 03:34:38 +0000
commit958563acc850a29e2aee9179ffb154900a8ca8a7 (patch)
tree31ebbe8c5d77de454fc4dcf51ae9e1f9ba40dc35
parent7e3b6178f20258f60cc9e9a7671287e4e02ffb76 (diff)
parent7616dfc21f9b782c94ae39e2b25e05881769b468 (diff)
Merge branch 'upstream' into upstream-merged
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 73598cfc..31e48efd 100644
--- a/configure.in
+++ b/configure.in
@@ -246,7 +246,7 @@ PKG_CHECK_MODULES([X11], [x11 xproto],
AS_IF([test $pkg_failed = no],
[XKB_BASE="$pkg_cv_XKB_BASE"
AC_MSG_RESULT([$XKB_BASE])],
- [XKB_BASE="$datadir/X11/xkb"
+ [XKB_BASE="$datadir/share/X11/xkb"
AC_MSG_RESULT([(default) $XKB_BASE])])
AC_MSG_CHECKING([for X11 prefix])
_PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11])