Commit b8fa2a80 authored by Michael Catanzaro's avatar Michael Catanzaro
Browse files

dazzle-list-counters installed without package_subdir

dazzle-list-counters needs to be installed respecting package_subdir, so
it doesn't clash with the main installation of libdazzle.

I notice there are not currently any subdirectories in my /usr/bin, so
to avoid setting a precedent for having directories there, let's use
libexec instead when package_subdir is set.
parent daed5e94
......@@ -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
......
......@@ -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