diff options
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | meson_options.txt | 4 | ||||
| -rw-r--r-- | pkgconfig/meson.build | 4 | ||||
| -rw-r--r-- | sh/meson.build | 4 | ||||
| -rw-r--r-- | src/librc/meson.build | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/meson.build b/meson.build index 348ddba7..dc169b5d 100644 --- a/meson.build +++ b/meson.build @@ -66,15 +66,15 @@ else pkg_prefix = option_pkg_prefix endif -root_prefix = get_option('root_prefix') -if root_prefix == '' - root_prefix = '/' +rootprefix = get_option('rootprefix') +if rootprefix == '' + rootprefix = '/' endif -bindir = root_prefix / get_option('bindir') -libdir = root_prefix / get_option('libdir') -libexecdir = root_prefix / get_option('libexecdir') +bindir = rootprefix / get_option('bindir') +libdir = rootprefix / get_option('libdir') +libexecdir = rootprefix / get_option('libexecdir') rc_libexecdir = libexecdir / 'rc' -sbindir = root_prefix / get_option('sbindir') +sbindir = rootprefix / get_option('sbindir') selinux_dep = dependency('libselinux', required : get_option('selinux')) if selinux_dep.found() diff --git a/meson_options.txt b/meson_options.txt index 5fbafac9..ce1b8dda 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,8 +16,8 @@ option('pkg_prefix', type : 'string', description : 'default location where packages are installed') option('pkgconfig', type : 'boolean', description : 'build PKGConfig files') -option('root_prefix', type : 'string', - description : 'default path of root directory') +option('rootprefix', type : 'string', + description : 'override the root prefix') option('selinux', type : 'feature', value : 'auto', description : 'enable SELinux support') option('shell', type : 'string', value : '/bin/sh', diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build index e3d44fa6..6edc8831 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -1,8 +1,8 @@ pkgconfig_dir = get_option('libdir') / 'pkgconfig' pkgconfig_conf_data = configuration_data() -if root_prefix != '/' - pkgconfig_conf_data.set('PREFIX', root_prefix) +if rootprefix != '/' + pkgconfig_conf_data.set('PREFIX', rootprefix) else pkgconfig_conf_data.set('PREFIX', '') endif diff --git a/sh/meson.build b/sh/meson.build index 33b128b1..6469a8da 100644 --- a/sh/meson.build +++ b/sh/meson.build @@ -1,8 +1,8 @@ sh_conf_data = configuration_data() -if root_prefix == '/' +if rootprefix == '/' sh_conf_data.set('PREFIX', '') else - sh_conf_data.set('PREFIX', root_prefix) + sh_conf_data.set('PREFIX', rootprefix) endif sh_conf_data.set('BINDIR', bindir) sh_conf_data.set('LIBEXECDIR', rc_libexecdir) diff --git a/src/librc/meson.build b/src/librc/meson.build index 4e560483..81c75080 100644 --- a/src/librc/meson.build +++ b/src/librc/meson.build @@ -1,8 +1,8 @@ rc_h_conf_data = configuration_data() -if root_prefix == '/' +if rootprefix == '/' rc_h_conf_data.set('PREFIX', '') else - rc_h_conf_data.set('PREFIX', root_prefix) + rc_h_conf_data.set('PREFIX', rootprefix) endif rc_h_conf_data.set('LIB', libname) rc_h_conf_data.set('LIBEXECDIR', rc_libexecdir) |