Commit 82f20d1d authored by Christian Hergert's avatar Christian Hergert
Browse files

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

Install stuff properly when using project_subdir

See merge request GNOME/libdazzle!14
parents daed5e94 a8988011
......@@ -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
......
......@@ -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(
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment