Commit 32822551 authored by Felipe Borges's avatar Felipe Borges 👣

build: Install under package_subdir root

parent 7e1294f3
......@@ -16,12 +16,12 @@ add_project_arguments([
], language: 'c')
package_subdir = get_option('package_subdir')
datadir = get_option('datadir')
libdir = join_paths(get_option('libdir'), package_subdir)
girdir = join_paths(datadir, package_subdir, 'gir-1.0')
typelibdir = join_paths(libdir, package_subdir, 'girepository-1.0')
datadir = join_paths (package_subdir, get_option('datadir'))
libdir = join_paths(package_subdir, get_option('libdir'))
girdir = join_paths(datadir, 'gir-1.0')
typelibdir = join_paths(libdir, 'girepository-1.0')
if package_subdir != ''
vapidir = join_paths(datadir, package_subdir, 'vapi')
vapidir = join_paths(datadir, 'vapi')
else
vapidir = join_paths(datadir, 'vala', 'vapi')
endif
......
......@@ -23,7 +23,7 @@ version_conf.set('MINOR_VERSION', MINOR_VERSION)
version_conf.set('MICRO_VERSION', MICRO_VERSION)
gtk_frdp_header_subdir = join_paths(package_subdir, 'gtk-frdp')
gtk_frdp_header_dir = join_paths(get_option('includedir'), gtk_frdp_header_subdir)
gtk_frdp_header_dir = join_paths(package_subdir, get_option('includedir'), gtk_frdp_header_subdir)
configure_file(
input: 'gtk-frdp-version.h.in',
......@@ -90,5 +90,5 @@ pkg.generate(
version: meson.project_version(),
subdirs: gtk_frdp_header_subdir,
requires: 'glib-2.0',
install_dir: join_paths(get_option('libdir'), 'pkgconfig')
install_dir: join_paths(libdir, 'pkgconfig')
)
  • Could you explain the reasoning behind this changes? Those new locations are weird and out of the FHS.

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