frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "suid touchup" 

Pushed the wrong thing, sigh.

This reverts commit 73a0562615.
This commit is contained in:
Adam Jackson 2018-03-27 12:58:15 -04:00
parent 73a0562615
commit a26195d5c1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/meson.build
View File

@ -86,7 +86,7 @@ conf_data.set('GBM_BO_WITH_MODIFIERS',
conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir) conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
conf_data.set_quoted('PROJECTROOT', get_option('prefix')) 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('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 # XXX: Stopped enumerating at COMPILEDEFAULTFONTPATH
conf_data.set('XORG_VERSION_CURRENT', release) conf_data.set('XORG_VERSION_CURRENT', release)

3
meson.build
View File

@ -492,8 +492,7 @@ manpage_config.set('bundle_id_prefix', '...')
manpage_config.set('modulepath', join_paths(get_option('prefix'), module_dir)) manpage_config.set('modulepath', join_paths(get_option('prefix'), module_dir))
# wtf doesn't this work # 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'), libexecdir))
suid_wrapper_dir = join_paths(get_option('prefix'), 'libexec') manpage_config.set('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') manpage_config.set('default_font_path', 'catalogue:/etc/X11/fontpath.d:built-ins')
# Include must come first, as it sets up dix-config.h # Include must come first, as it sets up dix-config.h