From: Zbigniew Jędrzejewski-Szmek Date: Mon, 12 Apr 2021 12:03:32 +0000 (+0200) Subject: meson: do not fail if rsync is not installed with meson 0.57.2 X-Git-Tag: v249-rc1~425 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c5fd25119a495009ea62f79e5daec34cc464628;p=thirdparty%2Fsystemd.git meson: do not fail if rsync is not installed with meson 0.57.2 https://github.com/mesonbuild/meson/issues/8641 Our CI started to fail. Even if the change is reverted in meson, we need a quick workaround here. --- diff --git a/man/meson.build b/man/meson.build index 3cae8446cda..f9c4b83dc81 100644 --- a/man/meson.build +++ b/man/meson.build @@ -184,17 +184,20 @@ html = custom_target( depends : html_pages, command : ['echo']) -run_target( - 'doc-sync', - depends : man_pages + html_pages, - command : ['rsync', '-rlv', - '--delete-excluded', - '--include=man', - '--include=*.html', - '--exclude=*', - '--omit-dir-times', - meson.current_build_dir(), - get_option('www-target')]) +rsync = find_program('rsync', required : false) +if rsync.found() + run_target( + 'doc-sync', + depends : man_pages + html_pages, + command : [rsync, '-rlv', + '--delete-excluded', + '--include=man', + '--include=*.html', + '--exclude=*', + '--omit-dir-times', + meson.current_build_dir(), + get_option('www-target')]) +endif ############################################################