From adc7f92874c82d66f07337e6d5c68c94a8b320f4 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 20 Jun 2017 01:23:55 -0500 Subject: [PATCH] meson: fix up SYSTEM_LIBDIR, SYSTEM_INCLUDEDIR, PKG_DEFAULT_PATH --- meson.build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 038c05f..5b976d5 100644 --- a/meson.build +++ b/meson.build @@ -40,9 +40,14 @@ foreach f : check_functions endif endforeach -cdata.set_quoted('SYSTEM_LIBDIR', '/fixme') -cdata.set_quoted('SYSTEM_INCLUDEDIR', '/fixme') -cdata.set_quoted('PKG_DEFAULT_PATH', '/fixme') +default_path = [] +foreach f : ['libdir', 'datadir'] + default_path += [join_paths(get_option('prefix'), get_option(f), 'pkgconfig')] +endforeach + +cdata.set_quoted('SYSTEM_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) +cdata.set_quoted('SYSTEM_INCLUDEDIR', join_paths(get_option('prefix'), get_option('includedir'))) +cdata.set_quoted('PKG_DEFAULT_PATH', ':'.join(default_path)) cdata.set_quoted('PACKAGE_NAME', meson.project_name()) cdata.set_quoted('PACKAGE_VERSION', meson.project_version()) cdata.set_quoted('PACKAGE_BUGREPORT', 'http://github.com/pkgconf/pkgconf/issues')