From cab458e27afe8dda78bef7c3605830f418d83ed1 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Wed, 29 Dec 2021 15:57:04 -0600
Subject: [PATCH] build: rename sh_dir variable to rc_shdir

---
 meson.build    |  1 +
 sh/meson.build | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 9b16d088..e21fae65 100644
--- a/meson.build
+++ b/meson.build
@@ -99,6 +99,7 @@ libexecdir = rootprefix / libexecdir
 rc_libexecdir = libexecdir / 'rc'
 rc_bindir = rc_libexecdir / 'bin'
 rc_sbindir = rc_libexecdir / 'sbin'
+rc_shdir = rc_libexecdir / 'sh'
 sbindir = rootprefix / get_option('sbindir')
 
 crypt_dep = []
diff --git a/sh/meson.build b/sh/meson.build
index 6469a8da..e8849d40 100644
--- a/sh/meson.build
+++ b/sh/meson.build
@@ -12,8 +12,6 @@ sh_conf_data.set('SBINDIR', sbindir)
 sh_conf_data.set('SHELL', get_option('shell'))
 sh_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
 
-sh_dir = rc_libexecdir / 'sh'
-
 sh = [
   'rc-functions.sh',
   'rc-mount.sh',
@@ -59,19 +57,19 @@ else
 endif
 
 install_data(sh,
-  install_dir : sh_dir)
+  install_dir : rc_shdir)
 foreach file : sh_config
   configure_file(input : file,
     output : '@BASENAME@',
     configuration : sh_conf_data,
-    install_dir : sh_dir)
+    install_dir : rc_shdir)
 endforeach
 
 foreach file : scripts_config
   configure_file(input : file,
     output : '@BASENAME@',
     configuration : sh_conf_data,
-    install_dir : sh_dir,
+    install_dir : rc_shdir,
     install_mode : 'rwxr-xr-x')
 endforeach
 
@@ -79,6 +77,6 @@ foreach file : scripts_config_os
   configure_file(input : file.get(0),
     output : file.get(1),
     configuration : sh_conf_data,
-    install_dir : sh_dir,
+    install_dir : rc_shdir,
     install_mode : 'rwxr-xr-x')
 endforeach