From 9e083598642f041d591a10858efb40ab1ec8414d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 28 Feb 2019 13:06:52 +0100 Subject: [PATCH 1/2] meson: remove workaround for old meson bug with command quoting Those bugs were fixed a long time ago. Let's take advantage of this and use the usual $() syntax. --- man/meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/man/meson.build b/man/meson.build index 05197d6ef4..6956f39c7b 100644 --- a/man/meson.build +++ b/man/meson.build @@ -198,12 +198,9 @@ if git.found() custom_target( 'update-man-rules', output : 'update-man-rules', - # slightly strange syntax because of - # https://github.com/mesonbuild/meson/issues/1643 - # and https://github.com/mesonbuild/meson/issues/1512 command : ['sh', '-c', 'cd @0@ && '.format(meson.build_root()) + - 'python3 @0@/tools/make-man-rules.py `git ls-files ":/man/*.xml"` >t && '.format(meson.source_root()) + + 'python3 @0@/tools/make-man-rules.py $(git ls-files ":/man/*.xml") >t && '.format(meson.source_root()) + 'mv t @0@/rules/meson.build'.format(meson.current_source_dir())], depend_files : custom_entities_ent) endif From 2dfdf9c4b2154bfa5f88f9fbae13a762057ccd1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 28 Feb 2019 13:09:58 +0100 Subject: [PATCH 2/2] man: create .so links for sd_bus_close_{unref,unrefp} Follow-up for bd62b7448623fbe36665e089977731efb55524c0. --- man/rules/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/rules/meson.build b/man/rules/meson.build index 0c990a0c5d..d949900ddc 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -275,7 +275,9 @@ manpages = [ ''], ['sd_bus_new', '3', - ['sd_bus_flush_close_unref', + ['sd_bus_close_unref', + 'sd_bus_close_unrefp', + 'sd_bus_flush_close_unref', 'sd_bus_flush_close_unrefp', 'sd_bus_ref', 'sd_bus_unref',