Commit a26195d5 authored by Adam Jackson's avatar Adam Jackson 🎧
Browse files

Revert "suid touchup"

Pushed the wrong thing, sigh.

This reverts commit 73a05626.
parent 73a05626
......@@ -86,7 +86,7 @@ conf_data.set('GBM_BO_WITH_MODIFIERS',
conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
conf_data.set_quoted('PROJECTROOT', get_option('prefix'))
conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir')))
conf_data.set_quoted('SUID_WRAPPER_DIR', suid_wrapper_dir)
conf_data.set_quoted('SUID_WRAPPER_DIR', join_paths(get_option('prefix'), get_option('libexecdir')))
# XXX: Stopped enumerating at COMPILEDEFAULTFONTPATH
conf_data.set('XORG_VERSION_CURRENT', release)
......
......@@ -492,8 +492,7 @@ manpage_config.set('bundle_id_prefix', '...')
manpage_config.set('modulepath', join_paths(get_option('prefix'), module_dir))
# wtf doesn't this work
# manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
suid_wrapper_dir = join_paths(get_option('prefix'), 'libexec')
manpage_config.set('suid_wrapper_dir', suid_wrapper_dir)
manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
manpage_config.set('default_font_path', 'catalogue:/etc/X11/fontpath.d:built-ins')
# Include must come first, as it sets up dix-config.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment