suid touchup
This commit is contained in:
parent
64b3227374
commit
73a0562615
|
@ -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', join_paths(get_option('prefix'), get_option('libexecdir')))
|
||||
conf_data.set_quoted('SUID_WRAPPER_DIR', suid_wrapper_dir)
|
||||
|
||||
# XXX: Stopped enumerating at COMPILEDEFAULTFONTPATH
|
||||
conf_data.set('XORG_VERSION_CURRENT', release)
|
||||
|
|
|
@ -492,7 +492,8 @@ 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))
|
||||
manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
|
||||
suid_wrapper_dir = join_paths(get_option('prefix'), 'libexec')
|
||||
manpage_config.set('suid_wrapper_dir', suid_wrapper_dir)
|
||||
manpage_config.set('default_font_path', 'catalogue:/etc/X11/fontpath.d:built-ins')
|
||||
|
||||
# Include must come first, as it sets up dix-config.h
|
||||
|
|
Loading…
Reference in New Issue
Block a user