diff --git a/man/meson.build b/man/meson.build index f555d629df..88e06b384a 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 0fa0f0aa17..a74fc196be 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