Merge branch 'v0.22.x'

2021-05-17 19:33:15 +02:00
parent c3226a3195 638dfc3981
commit a2bdac571a
18 changed files with 314 additions and 102 deletions
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -23,20 +23,6 @@ if get_option('html_manual')
    install: true,
    install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
  )
-
-  custom_target(
-    'upload',
-    input: sphinx_output,
-    output: 'upload',
-    build_always_stale: true,
-    command: [
-      'rsync', '-vpruz', '--delete', meson.current_build_dir() + '/',
-      'www.musicpd.org:/var/www/mpd/doc/',
-      '--chmod=Dug+rwx,Do+rx,Fug+rw,Fo+r',
-      '--include=html', '--include=html/**',
-      '--exclude=*',
-    ],
-  )
 endif

 if get_option('manpages')