From 21d81ea5a9ab71decabaf795f903208b09ae0621 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Thu, 30 Dec 2021 11:49:23 -0600
Subject: [PATCH] build: always add subdirs

---
 bash-completion/meson.build |  2 ++
 meson.build                 | 10 ++--------
 pkgconfig/meson.build       |  2 ++
 zsh-completion/meson.build  |  2 ++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bash-completion/meson.build b/bash-completion/meson.build
index 926bb065..fab42720 100644
--- a/bash-completion/meson.build
+++ b/bash-completion/meson.build
@@ -1,3 +1,4 @@
+if get_option('bash-completions')
 bash_completions = [
   'openrc',
   'openrc-service-script',
@@ -8,3 +9,4 @@ bash_completions = [
 
 install_data(bash_completions,
   install_dir : get_option('datadir') / 'bash-completion/completions')
+endif
diff --git a/meson.build b/meson.build
index dd60ae64..bd96c7d3 100644
--- a/meson.build
+++ b/meson.build
@@ -187,25 +187,19 @@ init_d_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
 dl_dep = cc.find_library('dl', required: false)
 util_dep = cc.find_library('util', required: false)
 
-if get_option('bash-completions')
-  subdir('bash-completion')
-endif
+subdir('bash-completion')
 subdir('conf.d')
 subdir('etc')
 subdir('init.d')
 subdir('local.d')
 subdir('man')
-if get_option('pkgconfig')
 subdir('pkgconfig')
-  endif
 subdir('scripts')
 subdir('sh')
 subdir('src')
 subdir('support')
 subdir('sysctl.d')
-if get_option('zsh-completions')
-  subdir('zsh-completion')
-endif
+subdir('zsh-completion')
 
 meson.add_install_script('tools/meson_runlevels.sh',
   os,
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 6edc8831..424b6ee0 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -1,3 +1,4 @@
+if get_option('pkgconfig')
 pkgconfig_dir =	get_option('libdir') / 'pkgconfig'
 
 pkgconfig_conf_data = configuration_data()
@@ -20,3 +21,4 @@ foreach file : pkgconfig_files
     configuration : pkgconfig_conf_data,
     install_dir : pkgconfig_dir)
 endforeach
+endif
diff --git a/zsh-completion/meson.build b/zsh-completion/meson.build
index b55d326b..b56118ca 100644
--- a/zsh-completion/meson.build
+++ b/zsh-completion/meson.build
@@ -1,3 +1,4 @@
+if get_option('zsh-completions')
 zsh_completions = [
   '_openrc',
   '_rc-service',
@@ -7,3 +8,4 @@ zsh_completions = [
 
 install_data(zsh_completions,
   install_dir : get_option('datadir') / 'zsh/site-functions')
+endif