summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Harrington <bryce@bryceharrington.org>2016-09-15 13:23:04 -0700
committerBryce Harrington <bryce@bryceharrington.org>2016-09-15 13:23:04 -0700
commit87ca8ab1e91925e4ba72fd644e6db4c2ca191ebd (patch)
tree45e9673fd6bce6d2c9093c0370ea2327e6955a0f
parentcf0787c2437e982a28ca1e8bccdebc4727bbebfa (diff)
wl_build: Also use --with-x-locale-root for xkbcommon
libxkbcommon by default will look under $prefix/share/X11 for locale files. Direct it to use the system locale files in /usr/share/X11 instead. This shows up as a problem when using the 'include "%L"' directive in compose files (e.g. .XCompose) to pull in the locale-specific Compose file -- xkbcommon looks in the wrong place and returns an error such as: xkbcommon: ERROR: ~/.XCompose:4:9: failed to expand %L to the locale Compose file xkbcommon: ERROR: ~/.XCompose:4:12: unterminated string literal Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
-rwxr-xr-xwl_build1
1 files changed, 1 insertions, 0 deletions
diff --git a/wl_build b/wl_build
index f0412a7..3bb489e 100755
--- a/wl_build
+++ b/wl_build
@@ -67,6 +67,7 @@ compile
gen libxkbcommon \
--with-xkb-config-root=/usr/share/X11/xkb \
+ --with-x-locale-root=/usr/share/X11/locale \
--disable-x11
compile