From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 24 Jan 2021 14:13:58 +0000 (+0000)
Subject: meson: Fix update-man-rules when the build dir is not a subdir of the project dir
X-Git-Tag: v248-rc1~258^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18365%2Fhead;p=thirdparty%2Fsystemd.git

meson: Fix update-man-rules when the build dir is not a subdir of the project dir

Until now, update-man-rules assumed that the build directory was
a subdirectory of the project directory. When using mkosi, this is
not the case. We use find instead of git ls-files because git ls-files
does not seem to support outputting absolute paths.

Also, this makes update-man-rules a bit more user-friendly as new manpages
don't have to be added to the git staging area before they are processed by
update-man-rules.py.
---

diff --git a/man/meson.build b/man/meson.build
index f555d629dfa..88e06b384a0 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -217,16 +217,14 @@ endif
 
 ############################################################
 
-if git.found()
-        custom_target(
-                'update-man-rules',
-                output : 'update-man-rules',
-                command : ['sh', '-c',
-                           'cd @0@ && '.format(meson.build_root()) +
-                           'python3 @0@/tools/update-man-rules.py $(git ls-files ":/man/*.xml") >t && '.format(project_source_root) +
-                           'mv t @0@/rules/meson.build'.format(meson.current_source_dir())],
-                depend_files : custom_entities_ent)
-endif
+custom_target(
+        'update-man-rules',
+        output : 'update-man-rules',
+        command : ['sh', '-c',
+                        'cd @0@ && '.format(meson.build_root()) +
+                        'python3 @0@/tools/update-man-rules.py $(find @0@ -wholename "*/man/*.xml") >t && '.format(project_source_root) +
+                        'mv t @0@/rules/meson.build'.format(meson.current_source_dir())],
+        depend_files : custom_entities_ent)
 
 ############################################################
 
diff --git a/mkosi.build b/mkosi.build
index f28c2892c3d..a74fc196be5 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -97,7 +97,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
 fi
 
 cd "$BUILDDIR"
-ninja $@
+ninja "$@"
 if [ "$WITH_TESTS" = 1 ] ; then
         for id in 1 2 3; do
                 getent group $id > /dev/null || groupadd -g $id testgroup$id