From 4c890ad3cc7b3445683d7b52bc00e4a58bef5e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 27 Jan 2021 08:46:42 +0100
Subject: [PATCH] meson: rename target to update-dbus-docs

Very old versions of meson did not include the subdirectory name in the
target name, so we started adding various "top-level" custom targets in
subdirectories. This was nice because the main meson.build file wasn't
as cluttered. But then meson started including the subdir name in the
target name. So let's move the definition to the root so we can have all
targets named uniformly.
---
 docs/RELEASE.md           |  2 +-
 man/meson.build           | 19 -------------------
 meson.build               | 19 +++++++++++++++++++
 tools/update-dbus-docs.py |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/RELEASE.md b/docs/RELEASE.md
index 5914464107..31a06515a1 100644
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -10,7 +10,7 @@ layout: default
 2. Update the contributors list in NEWS (`meson compile -C build git-contrib`)
 3. Update the time and place in NEWS
 4. [RC1] Update version and library numbers in `meson.build`
-5. Check dbus docs with `meson compile -C build man/update-dbus-docs`
+5. Check dbus docs with `meson compile -C build update-dbus-docs`
 6. Tag the release: `version=vXXX-rcY && git tag -s "${version}" -m "systemd ${version}"`
 7. Do `meson compile -C build`
 8. Make sure that the version string and package string match: `build/systemctl --version`
diff --git a/man/meson.build b/man/meson.build
index 88e06b384a..327df94c27 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -198,25 +198,6 @@ run_target(
 
 ############################################################
 
-if dbus_docs.length() > 0
-        custom_target(
-                'update-dbus-docs',
-                output : 'update-dbus-docs',
-                command : [update_dbus_docs_py,
-                           '--build-dir=@0@'.format(project_build_root),
-                           '@INPUT@'],
-                input : dbus_docs)
-
-        if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER'
-                test('dbus-docs-fresh',
-                     update_dbus_docs_py,
-                     args : ['--build-dir=@0@'.format(project_build_root),
-                             '--test'] + dbus_docs)
-        endif
-endif
-
-############################################################
-
 custom_target(
         'update-man-rules',
         output : 'update-man-rules',
diff --git a/meson.build b/meson.build
index 6d18355b0c..f1de3a87d3 100644
--- a/meson.build
+++ b/meson.build
@@ -3605,6 +3605,25 @@ run_target(
         depends : [man, libsystemd, libudev],
         command : [check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
 
+############################################################
+
+if dbus_docs.length() > 0
+        custom_target(
+                'update-dbus-docs',
+                output : 'update-dbus-docs',
+                command : [update_dbus_docs_py,
+                           '--build-dir=@0@'.format(project_build_root),
+                           '@INPUT@'],
+                input : dbus_docs)
+
+        if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER'
+                test('dbus-docs-fresh',
+                     update_dbus_docs_py,
+                     args : ['--build-dir=@0@'.format(project_build_root),
+                             '--test'] + dbus_docs)
+        endif
+endif
+
 ############################################################
 watchdog_opt = service_watchdog == '' ? 'disabled' : service_watchdog
 
diff --git a/tools/update-dbus-docs.py b/tools/update-dbus-docs.py
index 8fea0b8a00..ebe67af836 100755
--- a/tools/update-dbus-docs.py
+++ b/tools/update-dbus-docs.py
@@ -322,4 +322,4 @@ if __name__ == '__main__':
 
     if opts.test and outdated:
         exit(f'Outdated pages: {", ".join(outdated)}\n'
-             f'Hint: ninja -C {opts.build_dir} man/update-dbus-docs')
+             f'Hint: ninja -C {opts.build_dir} update-dbus-docs')