[libhandy] meson: Avoid a trailing slash on libdir and datadir

[Alexander Mikhaylenko <alexm src gnome org>]

commit 989855c8296b0af0b8d5f96fd47bca4b2f4cfa13
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Thu Mar 25 23:09:19 2021 +0000

    meson: Avoid a trailing slash on libdir and datadir
    
    When package_subdir is empty. This gets passed into the produced
    pkg-config file and then confuses meson. Perhaps a bug in meson, but we
    can avoid it here.
    
    https://github.com/mesonbuild/meson/issues/8593
    
    https://gitlab.gnome.org/GNOME/gnome-characters/-/issues/86

 meson.build | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 73c07a90..d06ed773 100644
--- a/meson.build
+++ b/meson.build
@@ -103,14 +103,18 @@ add_project_arguments(
 
 # Setup various paths that subdirectory meson.build files need
 package_subdir = get_option('package_subdir') # When used as subproject
-datadir        = get_option('datadir')  / package_subdir
-libdir         = get_option('libdir')  / package_subdir
-girdir         = get_option('datadir') / package_subdir / 'gir-1.0'
-typelibdir     = get_option('libdir')  / package_subdir / 'girepository-1.0'
 if package_subdir != ''
-  vapidir = get_option('datadir') / package_subdir / 'vapi'
+  datadir    = get_option('datadir') / package_subdir
+  libdir     = get_option('libdir')  / package_subdir
+  girdir     = get_option('datadir') / package_subdir / 'gir-1.0'
+  typelibdir = get_option('libdir')  / package_subdir / 'girepository-1.0'
+  vapidir    = get_option('datadir') / package_subdir / 'vapi'
 else
-  vapidir = get_option('datadir') / 'vala' / 'vapi'
+  datadir    = get_option('datadir')
+  libdir     = get_option('libdir')
+  girdir     = get_option('datadir') / 'gir-1.0'
+  typelibdir = get_option('libdir')  / 'girepository-1.0'
+  vapidir    = get_option('datadir') / 'vala' / 'vapi'
 endif
 
 glade_catalog_feature = get_option('glade_catalog')