diff --git a/src/librc/meson.build b/src/librc/meson.build index 30caa1f3f..82aa46d05 100644 --- a/src/librc/meson.build +++ b/src/librc/meson.build @@ -1,11 +1,6 @@ rc_h_conf_data = configuration_data() -if rootprefix == '/' - rc_h_conf_data.set('PREFIX', '') - else - rc_h_conf_data.set('PREFIX', rootprefix) - endif -rc_h_conf_data.set('LIB', libname) -rc_h_conf_data.set('LIBEXECDIR', rc_libexecdir) +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('LOCAL_PREFIX', local_prefix) rc_h_conf_data.set('PKG_PREFIX', pkg_prefix) rc_h_conf_data.set('SYSCONFDIR', get_option('sysconfdir')) diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index d90943b65..7f4ac0c05 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -22,13 +22,9 @@ extern "C" { #endif -#define RC_PREFIX "@PREFIX@" #define RC_SYSCONFDIR "@SYSCONFDIR@" -#define RC_LIBDIR "@PREFIX@/@LIB@/rc" -#define RC_LIBEXECDIR "@LIBEXECDIR@" -#if defined(PREFIX) -#define RC_SVCDIR RC_LIBEXECDIR "/init.d" -#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \ +#define RC_LIBEXECDIR "@RC_LIBEXECDIR@" +#if defined(__linux__) || (defined(__FreeBSD_kernel__) && \ defined(__GLIBC__)) || defined(__GNU__) #define RC_SVCDIR "/run/openrc" #else @@ -37,7 +33,7 @@ extern "C" { #define RC_RUNLEVELDIR RC_SYSCONFDIR "/runlevels" #define RC_INITDIR RC_SYSCONFDIR "/init.d" #define RC_CONFDIR RC_SYSCONFDIR "/conf.d" -#define RC_PLUGINDIR RC_LIBDIR "/plugins" +#define RC_PLUGINDIR "@RC_PLUGINDIR@" #define RC_INIT_FIFO RC_SVCDIR"/init.ctl" #define RC_PROFILE_ENV RC_SYSCONFDIR "/profile.env"