[PATCH xserver 3/3] meson: don't put literal 'PACKAGE_STRING' and 'XORG_MAN_PAGE' in man pages

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


Instead, substitute the same values as autotools does

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index c8df31b3b..f2c71fe27 100644
--- a/meson.build
+++ b/meson.build
@@ -507,8 +507,8 @@ top_srcdir_inc = include_directories('.')
 serverconfigdir = join_paths(get_option('libdir'), 'xorg')
 
 manpage_config = configuration_data()
-manpage_config.set('vendorversion', 'PACKAGE_STRING XORG_MAN_PAGE')
-manpage_config.set('xorgversion', 'PACKAGE_STRING XORG_MAN_PAGE')
+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'))
-- 
2.17.0



More information about the xorg-devel mailing list