diff options
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | meson_options.txt | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/meson.build b/meson.build index dc1a3fd8..4e330d33 100644 --- a/meson.build +++ b/meson.build @@ -83,16 +83,9 @@ else pkg_prefix = option_pkg_prefix endif -if get_option('split-usr') == 'auto' - split_usr = run_command('test', '-L', '/bin', check: false).returncode() != 0 -else - split_usr = get_option('split-usr') == 'true' -endif - rootprefix = get_option('rootprefix') -rootprefix_default = fs.is_symlink('/bin') ? '/usr' : '/' if rootprefix == '' -rootprefix = rootprefix_default +rootprefix = '/' endif bindir = rootprefix / get_option('bindir') diff --git a/meson_options.txt b/meson_options.txt index 2c74152e..1f38efbb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,9 +26,6 @@ option('selinux', type : 'feature', value : 'auto', description : 'enable SELinux support') option('shell', type : 'string', value : '/bin/sh', description : 'Default posix compatible shell') -option('split-usr', type : 'combo', - choices : ['auto', 'true', 'false'], - description : '''/bin, /sbin aren't symlinks into /usr''') option('sysvinit', type : 'boolean', value : false, description : 'enable SysVinit compatibility (linux only)') option('termcap', type : 'combo', |