[PATCH libinput] tools: add the libinput version to the man pages

Eric Engestrom eric.engestrom at imgtec.com
Fri Jun 30 15:21:39 UTC 2017


On Thursday, 2017-06-29 10:01:10 +1000, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  configure.ac                                       |  1 +
>  meson.build                                        | 45 +++++++++++++++++++---
>  tools/Makefile.am                                  |  7 ++++
>  ...ut-debug-events.1 => libinput-debug-events.man} |  2 +-
>  ...libinput-debug-gui.1 => libinput-debug-gui.man} |  2 +-
>  ...ut-list-devices.1 => libinput-list-devices.man} |  2 +-
>  ...pad-tap.1 => libinput-measure-touchpad-tap.man} |  2 +-
>  tools/{libinput-measure.1 => libinput-measure.man} |  2 +-
>  tools/{libinput.1 => libinput.man}                 |  2 +-
>  9 files changed, 53 insertions(+), 12 deletions(-)
>  rename tools/{libinput-debug-events.1 => libinput-debug-events.man} (97%)
>  rename tools/{libinput-debug-gui.1 => libinput-debug-gui.man} (94%)
>  rename tools/{libinput-list-devices.1 => libinput-list-devices.man} (94%)
>  rename tools/{libinput-measure-touchpad-tap.1 => libinput-measure-touchpad-tap.man} (96%)
>  rename tools/{libinput-measure.1 => libinput-measure.man} (90%)
>  rename tools/{libinput.1 => libinput.man} (95%)
> 
> diff --git a/configure.ac b/configure.ac
> index 067c3e1a..a66371cd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -46,6 +46,7 @@ AC_USE_SYSTEM_EXTENSIONS
>  AC_PROG_CC_C99
>  AC_PROG_CXX # Only used by build C++ test
>  AC_PROG_GREP
> +AC_PROG_SED
>  
>  # Only used for testing the hwdb
>  AM_PATH_PYTHON([3.0],, [:])
> diff --git a/meson.build b/meson.build
> index bd9b6193..bc639718 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -357,6 +357,9 @@ lib_tools_shared = static_library('tools_shared',
>  dep_tools_shared = declare_dependency(link_with : lib_tools_shared,
>  				      dependencies : deps_tools_shared)
>  
> +man_config = configuration_data()
> +man_config.set('LIBINPUT_VERSION', meson.project_version())
> +
>  deps_tools = [ dep_tools_shared, dep_libinput ]
>  libinput_debug_events_sources = [ 'tools/libinput-debug-events.c' ]
>  executable('libinput-debug-events',
> @@ -366,7 +369,12 @@ executable('libinput-debug-events',
>  	   install_dir : libinput_tool_path,
>  	   install : true
>  	   )
> -install_man('tools/libinput-debug-events.1')
> +configure_file(input : 'tools/libinput-debug-events.man',
> +	       output : 'libinput-debug-events.1',
> +	       configuration : man_config,

Well, it's a shame install_man() doesn't have a `configuration:`
argument :(

> +	       install : true,
> +	       install_dir : join_paths(get_option('mandir'), 'man1')

Took me a minute to find that get_option() allows you to query builtin
options as well [1]. Is there a list of those builtins somewhere?

[1] http://mesonbuild.com/Build-options.html

Assuming 'mandir' is indeed in that list,
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>


More information about the wayland-devel mailing list