Merge branch 'mcatanzaro/subproject-installation' into 'master'

Install stuff properly when using project_subdir

See merge request GNOME/libdazzle!14

meson.build

@@ -134,8 +134,11 @@ libdir = join_paths(get_option('libdir'), package_subdir)
 girdir = join_paths(get_option('datadir'), package_subdir, 'gir-1.0')
 typelibdir = join_paths(get_option('libdir'), package_subdir, 'girepository-1.0')
 if package_subdir != ''
+  bindir = get_option('bindir')
   vapidir = join_paths(get_option('datadir'), package_subdir, 'vapi')
 else
+  # Use libexecdir to avoid subdirectories under bindir
+  bindir = join_paths(get_option('libexecdir'), package_subdir)
   vapidir = join_paths(get_option('datadir'), 'vala', 'vapi')
 endif
 

src/meson.build

@@ -106,6 +106,7 @@ libdazzle = shared_library(
          dependencies: libdazzle_deps,
   include_directories: [ root_inc, src_inc ],
               install: true,
+          install_dir: libdir
 )
 
 libdazzle_dep = declare_dependency(

tools/meson.build

@@ -5,6 +5,7 @@ if host_machine.system() != 'windows'
 dazzle_list_counters = executable('dazzle-list-counters', 'dazzle-list-counters.c',
   dependencies: libdazzle_deps + [libdazzle_dep],
        install: true,
+   install_dir: bindir
 )
 endif