diff --git a/meson.build b/meson.build index e41d58059..f5534779d 100644 --- a/meson.build +++ b/meson.build @@ -79,11 +79,12 @@ else pkg_prefix = option_pkg_prefix endif -bindir = get_option('bindir') -libdir = get_option('libdir') -libexecdir = get_option('libexecdir') -sbindir = get_option('sbindir') -rc_libexecdir = get_option('prefix') / libexecdir / 'rc' +bindir = get_option('prefix') / get_option('bindir') +libdir = get_option('prefix') / get_option('libdir') +pluginsdir = libdir / 'rc/plugins' +libexecdir = get_option('prefix') / get_option('libexecdir') +sbindir = get_option('prefix') / get_option('sbindir') +rc_libexecdir = libexecdir / 'rc' rc_bindir = rc_libexecdir / 'bin' rc_sbindir = rc_libexecdir / 'sbin' rc_shdir = rc_libexecdir / 'sh' @@ -221,7 +222,7 @@ if get_option('pkgconfig') libraries : librc, subdirs : ['openrc'], variables: { - 'pluginsdir': get_option('prefix') / get_option('libdir') / 'rc/plugins', + 'pluginsdir': pluginsdir, } ) endif diff --git a/src/librc/meson.build b/src/librc/meson.build index 82aa46d05..c17588266 100644 --- a/src/librc/meson.build +++ b/src/librc/meson.build @@ -1,6 +1,6 @@ rc_h_conf_data = configuration_data() -rc_h_conf_data.set('RC_LIBEXECDIR', get_option('prefix') / get_option('libexecdir') / 'rc') -rc_h_conf_data.set('RC_PLUGINDIR', get_option('prefix') / libdir / 'rc/plugins' ) +rc_h_conf_data.set('RC_LIBEXECDIR', rc_libexecdir) +rc_h_conf_data.set('RC_PLUGINDIR', pluginsdir) rc_h_conf_data.set('LOCAL_PREFIX', local_prefix) rc_h_conf_data.set('PKG_PREFIX', pkg_prefix) rc_h_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))