From d07572e1b7853f30e920d1ff9c7c55f21d5c96e5 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 20 Sep 2021 22:49:05 -0500 Subject: build: fix rootprefix This fixes #438. --- meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 3b787086..43df8fa5 100644 --- a/meson.build +++ b/meson.build @@ -72,19 +72,19 @@ else split_usr = get_option('split-usr') == 'true' endif -rootprefix_default = split_usr ? '/' : '/usr' -rootprefix_path = get_option('rootprefix') -rootprefix = rootprefix_path != '' ? rootprefix_path : rootprefix_default +rootprefix = get_option('rootprefix') +rootprefix_default = '/' +if rootprefix == '' +rootprefix = rootprefix_default +endif bindir = rootprefix / get_option('bindir') libdir = rootprefix / get_option('libdir') -if os == 'Linux' and split_usr - libexecpath = 'lib' -else - libexecpath = get_option('libexecdir') +libexecdir = get_option('libexecdir') +if os == 'Linux' and libexecdir == 'libexec' + libexecdir = 'lib' endif -libexecdir = split_usr ? rootprefix / libexecpath : - get_option('prefix') / libexecpath +libexecdir = rootprefix / libexecdir rc_libexecdir = libexecdir / 'rc' sbindir = rootprefix / get_option('sbindir') -- cgit v1.2.3