[geary/mjog/meson-cleanup: 3/8] Update valadoc target

[Michael Gratton <mjog src gnome org>]

commit 64f14b4a78f1864c1d7619e4e39be866f51d9d24
Author: Michael Gratton <mike vee net>
Date:   Fri Sep 27 23:51:19 2019 +1000

    Update valadoc target
    
    Don't append the version to the package name so the URI stops changing
    with every release. Tidy up arg formatting a bit.

 src/meson.build | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 0555d5a6..9ebbd5df 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -94,14 +94,22 @@ if enable_valadoc
       '--verbose',
       '--force',
       '--internal',
-      '--package-name=@0@-@1@'.format(meson.project_name(), meson.project_version()),
+      '--package-name=@0@'.format(meson.project_name()),
       '--package-version=@0@'.format(meson.project_version()),
       '-b', meson.current_source_dir(),
       '-o', '@OUTPUT@',
       '--vapidir=@0@'.format(vapi_dir),
       '--vapidir=@0@'.format(meson.current_build_dir()),
-      # Hopefully, Meson gets baked-in valadoc support, so we don't have to do this (see also 
https://github.com/mesonbuild/meson/issues/894)
-      '--pkg', 'glib-2.0', '--pkg', 'gio-2.0', '--pkg', 'gee-0.8', '--pkg', 'sqlite3', '--pkg', 'gmime-2.6', 
'--pkg', 'javascriptcoregtk-4.0', '--pkg', 'libxml-2.0', '--pkg', 'libunwind',
+      # Hopefully, Meson gets baked-in valadoc support, so we don't
+      # have to do this (see https://github.com/mesonbuild/meson/issues/894)
+      '--pkg', 'glib-2.0',
+      '--pkg', 'gio-2.0',
+      '--pkg', 'gee-0.8',
+      '--pkg', 'sqlite3',
+      '--pkg', 'gmime-2.6',
+      '--pkg', 'javascriptcoregtk-4.0',
+      '--pkg', 'libxml-2.0',
+      '--pkg', 'libunwind',
       '@INPUT@',
     ]
   )