emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: change root_prefix to rootprefix

Browse Source
This commit is contained in:
William Hubbs 2021-09-06 14:30:30 -05:00
parent c0f8313164
commit 444e44eb9d
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@ -66,15 +66,15 @@ else
pkg_prefix = option_pkg_prefix pkg_prefix = option_pkg_prefix
endif endif
root_prefix = get_option('root_prefix') rootprefix = get_option('rootprefix')
if root_prefix == '' if rootprefix == ''
root_prefix = '/' rootprefix = '/'
endif endif
bindir = root_prefix / get_option('bindir') bindir = rootprefix / get_option('bindir')
libdir = root_prefix / get_option('libdir') libdir = rootprefix / get_option('libdir')
libexecdir = root_prefix / get_option('libexecdir') libexecdir = rootprefix / get_option('libexecdir')
rc_libexecdir = libexecdir / 'rc' rc_libexecdir = libexecdir / 'rc'
sbindir = root_prefix / get_option('sbindir') sbindir = rootprefix / get_option('sbindir')
selinux_dep = dependency('libselinux', required : get_option('selinux')) selinux_dep = dependency('libselinux', required : get_option('selinux'))
if selinux_dep.found() if selinux_dep.found()

4
meson_options.txt
View File

@ -16,8 +16,8 @@ option('pkg_prefix', type : 'string',
description : 'default location where packages are installed') description : 'default location where packages are installed')
option('pkgconfig', type : 'boolean', option('pkgconfig', type : 'boolean',
description : 'build PKGConfig files') description : 'build PKGConfig files')
option('root_prefix', type : 'string', option('rootprefix', type : 'string',
description : 'default path of root directory') description : 'override the root prefix')
option('selinux', type : 'feature', value : 'auto', option('selinux', type : 'feature', value : 'auto',
description : 'enable SELinux support') description : 'enable SELinux support')
option('shell', type : 'string', value : '/bin/sh', option('shell', type : 'string', value : '/bin/sh',

4
pkgconfig/meson.build
View File

@ -1,8 +1,8 @@
pkgconfig_dir = get_option('libdir') / 'pkgconfig' pkgconfig_dir = get_option('libdir') / 'pkgconfig'
pkgconfig_conf_data = configuration_data() pkgconfig_conf_data = configuration_data()
if root_prefix != '/' if rootprefix != '/'
pkgconfig_conf_data.set('PREFIX', root_prefix) pkgconfig_conf_data.set('PREFIX', rootprefix)
else else
pkgconfig_conf_data.set('PREFIX', '') pkgconfig_conf_data.set('PREFIX', '')
endif endif

4
sh/meson.build
View File

@ -1,8 +1,8 @@
sh_conf_data = configuration_data() sh_conf_data = configuration_data()
if root_prefix == '/' if rootprefix == '/'
sh_conf_data.set('PREFIX', '') sh_conf_data.set('PREFIX', '')
else else
sh_conf_data.set('PREFIX', root_prefix) sh_conf_data.set('PREFIX', rootprefix)
endif endif
sh_conf_data.set('BINDIR', bindir) sh_conf_data.set('BINDIR', bindir)
sh_conf_data.set('LIBEXECDIR', rc_libexecdir) sh_conf_data.set('LIBEXECDIR', rc_libexecdir)

4
src/librc/meson.build
View File

@ -1,8 +1,8 @@
rc_h_conf_data = configuration_data() rc_h_conf_data = configuration_data()
if root_prefix == '/' if rootprefix == '/'
rc_h_conf_data.set('PREFIX', '') rc_h_conf_data.set('PREFIX', '')
else else
rc_h_conf_data.set('PREFIX', root_prefix) rc_h_conf_data.set('PREFIX', rootprefix)
endif endif
rc_h_conf_data.set('LIB', libname) rc_h_conf_data.set('LIB', libname)
rc_h_conf_data.set('LIBEXECDIR', rc_libexecdir) rc_h_conf_data.set('LIBEXECDIR', rc_libexecdir)