build: always add subdirs

This commit is contained in:
William Hubbs 2021-12-30 11:49:23 -06:00
parent fd70988587
commit 21d81ea5a9
4 changed files with 8 additions and 8 deletions

View File

@ -1,3 +1,4 @@
if get_option('bash-completions')
bash_completions = [ bash_completions = [
'openrc', 'openrc',
'openrc-service-script', 'openrc-service-script',
@ -8,3 +9,4 @@ bash_completions = [
install_data(bash_completions, install_data(bash_completions,
install_dir : get_option('datadir') / 'bash-completion/completions') install_dir : get_option('datadir') / 'bash-completion/completions')
endif

View File

@ -187,25 +187,19 @@ init_d_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
dl_dep = cc.find_library('dl', required: false) dl_dep = cc.find_library('dl', required: false)
util_dep = cc.find_library('util', required: false) util_dep = cc.find_library('util', required: false)
if get_option('bash-completions')
subdir('bash-completion') subdir('bash-completion')
endif
subdir('conf.d') subdir('conf.d')
subdir('etc') subdir('etc')
subdir('init.d') subdir('init.d')
subdir('local.d') subdir('local.d')
subdir('man') subdir('man')
if get_option('pkgconfig')
subdir('pkgconfig') subdir('pkgconfig')
endif
subdir('scripts') subdir('scripts')
subdir('sh') subdir('sh')
subdir('src') subdir('src')
subdir('support') subdir('support')
subdir('sysctl.d') subdir('sysctl.d')
if get_option('zsh-completions')
subdir('zsh-completion') subdir('zsh-completion')
endif
meson.add_install_script('tools/meson_runlevels.sh', meson.add_install_script('tools/meson_runlevels.sh',
os, os,

View File

@ -1,3 +1,4 @@
if get_option('pkgconfig')
pkgconfig_dir = get_option('libdir') / 'pkgconfig' pkgconfig_dir = get_option('libdir') / 'pkgconfig'
pkgconfig_conf_data = configuration_data() pkgconfig_conf_data = configuration_data()
@ -20,3 +21,4 @@ foreach file : pkgconfig_files
configuration : pkgconfig_conf_data, configuration : pkgconfig_conf_data,
install_dir : pkgconfig_dir) install_dir : pkgconfig_dir)
endforeach endforeach
endif

View File

@ -1,3 +1,4 @@
if get_option('zsh-completions')
zsh_completions = [ zsh_completions = [
'_openrc', '_openrc',
'_rc-service', '_rc-service',
@ -7,3 +8,4 @@ zsh_completions = [
install_data(zsh_completions, install_data(zsh_completions,
install_dir : get_option('datadir') / 'zsh/site-functions') install_dir : get_option('datadir') / 'zsh/site-functions')
endif