From 27eff10bfa1a02da7338a82e2312d2080e3e5876 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 13 May 2018 19:36:05 +0100 Subject: [PATCH] meson: don't put literal 'PACKAGE_STRING' and 'XORG_MAN_PAGE' in man pages Instead, substitute the same values as autotools does Reviewed-by: Adam Jackson Signed-off-by: Jon Turney --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index b89c3d426..650018c29 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'))