Commit 02d0d270 authored by Christian Hergert's avatar Christian Hergert
Browse files

Merge branch 'master' into 'master'

Fix bindir expanding to libexecdir when not building libdazzle as a subproject

See merge request GNOME/libdazzle!15
parents 694ab037 385c7fee
......@@ -134,11 +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'), package_subdir, 'vapi')
else
bindir = get_option('bindir')
vapidir = join_paths(get_option('datadir'), 'vala', 'vapi')
endif
......
Markdown is supported
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