xserver: Branch 'master'

[GitLab Mirror]

 man/meson.build |   36 ++++++++++++++++++++++++++++++++++++
 meson.build     |   37 +------------------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

New commits:
commit 58117a0c3e9c29f7244531f6520e973c03d24ed4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 21 16:19:20 2024 +0100

    meson.build: move manpage specific stuff to man/ subdir
    
    Tidy up the huge file a little bit.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1433>

diff --git a/man/meson.build b/man/meson.build
new file mode 100644
index 000000000..2961469c5
--- /dev/null
+++ b/man/meson.build
@@ -0,0 +1,36 @@
+manpage_config = configuration_data()
+manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
+manpage_config.set('xorgversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
+manpage_config.set('xservername', 'Xorg')
+manpage_config.set('xconfigfile', 'xorg.conf')
+manpage_config.set('projectroot', get_option('prefix'))
+manpage_config.set('apploaddir', '$(appdefaultdir)')
+manpage_config.set('appmansuffix', '1')
+manpage_config.set('drivermansuffix', '4')
+manpage_config.set('adminmansuffix', '8')
+manpage_config.set('libmansuffix', '3')
+manpage_config.set('miscmansuffix', '7')
+manpage_config.set('filemansuffix', '5')
+manpage_config.set('logdir', log_dir)
+manpage_config.set('datadir', join_paths(get_option('prefix'), get_option('datadir')))
+manpage_config.set('mandir', join_paths(get_option('prefix'), get_option('mandir')))
+manpage_config.set('sysconfdir', join_paths(get_option('prefix'), get_option('sysconfdir')))
+manpage_config.set('xconfigdir', 'xorg.conf.d')
+manpage_config.set('xkbdir', xkb_dir)
+manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules'))
+manpage_config.set('XKB_DFLT_MODEL', get_option('xkb_default_model'))
+manpage_config.set('XKB_DFLT_LAYOUT', get_option('xkb_default_layout'))
+manpage_config.set('XKB_DFLT_VARIANT', get_option('xkb_default_variant'))
+manpage_config.set('XKB_DFLT_OPTIONS', get_option('xkb_default_options'))
+manpage_config.set('bundle_id_prefix', '...')
+manpage_config.set('modulepath', 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'))
+manpage_config.set('default_font_path', default_font_path)
+
+install_man(configure_file(
+    input: 'Xserver.man',
+    output: 'Xserver.1',
+    configuration: manpage_config,
+))
diff --git a/meson.build b/meson.build
index 935e3b8b1..6aced835c 100644
--- a/meson.build
+++ b/meson.build
@@ -688,36 +688,7 @@ 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()))
-manpage_config.set('xorgversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
-manpage_config.set('xservername', 'Xorg')
-manpage_config.set('xconfigfile', 'xorg.conf')
-manpage_config.set('projectroot', get_option('prefix'))
-manpage_config.set('apploaddir', '$(appdefaultdir)')
-manpage_config.set('appmansuffix', '1')
-manpage_config.set('drivermansuffix', '4')
-manpage_config.set('adminmansuffix', '8')
-manpage_config.set('libmansuffix', '3')
-manpage_config.set('miscmansuffix', '7')
-manpage_config.set('filemansuffix', '5')
-manpage_config.set('logdir', log_dir)
-manpage_config.set('datadir', join_paths(get_option('prefix'), get_option('datadir')))
-manpage_config.set('mandir', join_paths(get_option('prefix'), get_option('mandir')))
-manpage_config.set('sysconfdir', join_paths(get_option('prefix'), get_option('sysconfdir')))
-manpage_config.set('xconfigdir', 'xorg.conf.d')
-manpage_config.set('xkbdir', xkb_dir)
-manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules'))
-manpage_config.set('XKB_DFLT_MODEL', get_option('xkb_default_model'))
-manpage_config.set('XKB_DFLT_LAYOUT', get_option('xkb_default_layout'))
-manpage_config.set('XKB_DFLT_VARIANT', get_option('xkb_default_variant'))
-manpage_config.set('XKB_DFLT_OPTIONS', get_option('xkb_default_options'))
-manpage_config.set('bundle_id_prefix', '...')
-manpage_config.set('modulepath', 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'))
-manpage_config.set('default_font_path', default_font_path)
+subdir('man')
 
 require_docs = get_option('docs') == 'true'
 require_devel_docs = get_option('devel-docs') == 'true'
@@ -831,12 +802,6 @@ if host_machine.system() != 'windows'
     subdir('test')
 endif
 
-install_man(configure_file(
-    input: 'man/Xserver.man',
-    output: 'Xserver.1',
-    configuration: manpage_config,
-))
-
 if build_xorg
     sdkconfig = configuration_data()
     awk = find_program('awk')