Skip to content
  • Lyude Paul's avatar
    meson: Add xkb_bin_dir option · 10cba7d5
    Lyude Paul authored and Adam Jackson's avatar Adam Jackson committed
    
    
    Now that we can actually configure all of the directories xkb uses for
    finding things, we can (finally, but only with meson) finally make it so
    that with the correct meson configuration the Xserver will "just work"
    without any additional changes to the installation prefix after
    building.
    
    For the people like me who have since scripted this part out of their
    build process and forgotten about it, building and installing the X
    server into a non-standard prefix has always required the following (or
    something else that makes sure that X has a valid xkbcomp configuration)
    commands be run right after doing the installation:
    
    	# start in root of prefix you installed X to
    	mkdir -pv share/X11/xkb/rules
    	ln -s /usr/share/X11/xkb/rules/evdev share/X11/xkb/rules/
    	rm -f bin/xkbcomp
    	ln -s /usr/bin/xkbcomp bin/
    
    The one last piece of getting rid of this post-install junk is making
    sure that we can control the directory that X uses for finding the
    xkbcomp binary from meson so we can point it at the system provided
    xkbcomp (/usr/bin/xkbcomp or similar). So, this patch adds a
    configuration option for controlling this called xkb_bin_dir.
    
    Signed-off-by: Lyude Paul's avatarLyude Paul <lyude@redhat.com>
    Reviewed-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
    10cba7d5