Use cleaner workaround to fetch xkeyboard-config location

ef8deaff · Cédric de Saint Martin · b5b4f328 · ef8deaff
Commit ef8deaff authored Nov 10, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

component/xorg/buildout.cfg component/xorg/buildout.cfg +2 -2

No files found.
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -284,9 +284,9 @@ recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2
 md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a
 # Hardcoded location for xkeyboard-config, needed during compile time
-xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11/xkb
+xkeyboard-config-location = ${libxkbfile:location}/../${xkeyboard-config:_buildout_section_name_}
 configure-options =
-  --with-xkb-config-root=${:xkeyboard-config-location}
+  --with-xkb-config-root=${:xkeyboard-config-location}/share/X11/xkb
 environment =
  PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
  LD_LIBRARY_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib