[PATCH xserver 2/3] meson: don't install xorg wrapper manpages if suid-wrapper isn't being used

Jon Turney jon.turney at dronecode.org.uk
Sun May 13 18:36:04 UTC 2018


Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---
 hw/xfree86/meson.build | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 133c96d89..cacf56d4c 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -190,17 +190,19 @@ install_man(configure_file(
     configuration: manpage_config,
 ))
 
-install_man(configure_file(
-    input: 'man/Xorg.wrap.man',
-    output: 'Xorg.wrap.1',
-    configuration: manpage_config,
-))
-
-install_man(configure_file(
-    input: 'man/Xwrapper.config.man',
-    output: 'Xwrapper.config.5',
-    configuration: manpage_config,
-))
+if get_option('suid_wrapper')
+    install_man(configure_file(
+        input: 'man/Xorg.wrap.man',
+        output: 'Xorg.wrap.1',
+        configuration: manpage_config,
+    ))
+
+    install_man(configure_file(
+        input: 'man/Xwrapper.config.man',
+        output: 'Xwrapper.config.5',
+        configuration: manpage_config,
+    ))
+endif
 
 install_man(configure_file(
     input: 'man/xorg.conf.man',
-- 
2.17.0



More information about the xorg-devel mailing list