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

build: rename sh_dir variable to rc_shdir

Browse Source
This commit is contained in:
William Hubbs 2021-12-29 15:57:04 -06:00
parent 6e214b2616
commit cab458e27a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -99,6 +99,7 @@ libexecdir = rootprefix / libexecdir
rc_libexecdir = libexecdir / 'rc' rc_libexecdir = libexecdir / 'rc'
rc_bindir = rc_libexecdir / 'bin' rc_bindir = rc_libexecdir / 'bin'
rc_sbindir = rc_libexecdir / 'sbin' rc_sbindir = rc_libexecdir / 'sbin'
rc_shdir = rc_libexecdir / 'sh'
sbindir = rootprefix / get_option('sbindir') sbindir = rootprefix / get_option('sbindir')
crypt_dep = [] crypt_dep = []

10
sh/meson.build
View File

@ -12,8 +12,6 @@ sh_conf_data.set('SBINDIR', sbindir)
sh_conf_data.set('SHELL', get_option('shell')) sh_conf_data.set('SHELL', get_option('shell'))
sh_conf_data.set('SYSCONFDIR', get_option('sysconfdir')) sh_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
sh_dir = rc_libexecdir / 'sh'
sh = [ sh = [
'rc-functions.sh', 'rc-functions.sh',
'rc-mount.sh', 'rc-mount.sh',
@ -59,19 +57,19 @@ else
endif endif
install_data(sh, install_data(sh,
install_dir : sh_dir) install_dir : rc_shdir)
foreach file : sh_config foreach file : sh_config
configure_file(input : file, configure_file(input : file,
output : '@BASENAME@', output : '@BASENAME@',
configuration : sh_conf_data, configuration : sh_conf_data,
install_dir : sh_dir) install_dir : rc_shdir)
endforeach endforeach
foreach file : scripts_config foreach file : scripts_config
configure_file(input : file, configure_file(input : file,
output : '@BASENAME@', output : '@BASENAME@',
configuration : sh_conf_data, configuration : sh_conf_data,
install_dir : sh_dir, install_dir : rc_shdir,
install_mode : 'rwxr-xr-x') install_mode : 'rwxr-xr-x')
endforeach endforeach
@ -79,6 +77,6 @@ foreach file : scripts_config_os
configure_file(input : file.get(0), configure_file(input : file.get(0),
output : file.get(1), output : file.get(1),
configuration : sh_conf_data, configuration : sh_conf_data,
install_dir : sh_dir, install_dir : rc_shdir,
install_mode : 'rwxr-xr-x') install_mode : 'rwxr-xr-x')
endforeach endforeach