diff --git a/meson.build b/meson.build index 0279ea211..6a695d182 100644 --- a/meson.build +++ b/meson.build @@ -691,7 +691,10 @@ glx_inc = include_directories('glx') top_dir_inc = include_directories('.') -serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg') +serverconfigdir = get_option('serverconfigdir') +if serverconfigdir == '' + serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg') +endif manpage_config = configuration_data() manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version())) diff --git a/meson_options.txt b/meson_options.txt index e972717b9..7872d1d20 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,6 +29,8 @@ option('module_dir', type: 'string', value: 'xorg/modules', option('default_font_path', type: 'string') option('fontrootdir', type: 'string', description: 'Root directory for legacy fonts. Default: from font-utils.pc or $datadir/fonts/X11') +option('serverconfigdir', type: 'string', + description: 'Miscellaneous server configuration files path. Default: $libdir/xorg') option('glx', type: 'boolean', value: true) option('xdmcp', type: 'boolean', value: true)