[PATCH rendercheck v3 3/4] Simplify manpage variable substitution for Meson.

Eric Anholt eric at anholt.net
Wed Mar 29 20:19:34 UTC 2017


The previous code was contorting itself to do the substitution in the
same source format as the xorg automake macros.  Now that automake is
gone, we can simplify it.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 man/rendercheck.man |  2 +-
 meson.build         | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/man/rendercheck.man b/man/rendercheck.man
index b7be417d5c37..3d0e16f16f0f 100644
--- a/man/rendercheck.man
+++ b/man/rendercheck.man
@@ -1,5 +1,5 @@
 .ds q \N'34'
-.TH rendercheck 1 __xorgversion__
+.TH rendercheck 1 "rendercheck @version@" "X Version 11"
 .SH NAME
 rendercheck \- simple tests of the X Render extension.
 .SH SYNOPSIS
diff --git a/meson.build b/meson.build
index 25b8e4381ec1..e9f5bf45eb9a 100644
--- a/meson.build
+++ b/meson.build
@@ -48,19 +48,12 @@ executable(
     install: true,
 )
 
-man_xorgversion = '"rendercheck @0@" "X Version 11"'.format(project_version)
-
-custom_target(
-    'manpage',
+man_config = configuration_data()
+man_config.set('version', project_version)
+rendercheck_man = configure_file(
     input: 'man/rendercheck.man',
     output: 'rendercheck.1',
-    command: [
-        'sed',
-        '-e',
-	's/__xorgversion__/@0@/'.format(man_xorgversion),
-	'@INPUT@'
-    ],
-    capture: true,
+    configuration: man_config,
     install: true,
     install_dir: join_paths(get_option('mandir'), 'man1'),
 )
-- 
2.11.0



More information about the xorg-devel mailing list