Move the init scripts out of the prefix into the new script dir.

The previous directory was okay for home directory installs but
was problematic for system wide installs.

1 files changed, 6 insertions, 0 deletions

diff --git a/configure b/configure
index ca2e2f19b..c1052dff9 100755
--- a/configure
+++ b/configure
@@ -59,6 +59,7 @@ my ($opt_binary_dir,
     $opt_manual_dir,
     $opt_module_dir,
     $opt_prefix,
+    $opt_script_dir,
     $opt_socketengine,
     $opt_system,
     $opt_uid);
@@ -88,6 +89,7 @@ GetOptions(
 	'manual-dir=s'         => \$opt_manual_dir,
 	'module-dir=s'         => \$opt_module_dir,
 	'prefix=s'             => \$opt_prefix,
+	'script-dir=s'         => \$opt_script_dir,
 	'socketengine=s'       => \$opt_socketengine,
 	'system'               => \$opt_system,
 	'uid=s'                => \$opt_uid,
@@ -122,6 +124,7 @@ our $interactive = !(
 	defined $opt_manual_dir ||
 	defined $opt_module_dir ||
 	defined $opt_prefix ||
+	defined $opt_script_dir ||
 	defined $opt_socketengine ||
 	defined $opt_system ||
 	defined $opt_uid
@@ -184,6 +187,7 @@ if (defined $opt_system) {
 	$config{LOG_DIR}    = $opt_module_dir // '/var/log/inspircd';
 	$config{MANUAL_DIR} = $opt_manual_dir // '/usr/share/man/man1';
 	$config{MODULE_DIR} = $opt_module_dir // '/usr/lib/inspircd';
+	$config{SCRIPT_DIR} = $opt_script_dir // '/usr/share/inspircd'
 } else {
 	$config{BASE_DIR}   = $opt_prefix     // $config{BASE_DIR}   // rel2abs 'run';
 	$config{BINARY_DIR} = $opt_binary_dir // $config{BINARY_DIR} // rel2abs $config{BASE_DIR} . '/bin';
@@ -192,6 +196,7 @@ if (defined $opt_system) {
 	$config{LOG_DIR}    = $opt_log_dir    // $config{LOG_DIR}    // rel2abs $config{BASE_DIR} . '/logs';
 	$config{MANUAL_DIR} = $opt_manual_dir // $config{MANUAL_DIR} // rel2abs $config{BASE_DIR} . '/manuals';
 	$config{MODULE_DIR} = $opt_module_dir // $config{MODULE_DIR} // rel2abs $config{BASE_DIR} . '/modules';
+	$config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR};
 }
 
 # Parse --gid=123 or --gid=foo and extract the group id.
@@ -334,6 +339,7 @@ print_format <<"EOM";
   <|GREEN Log:|>    $config{LOG_DIR}
   <|GREEN Manual:|> $config{MANUAL_DIR}
   <|GREEN Module:|> $config{MODULE_DIR}
+  <|GREEN Script:|> $config{SCRIPT_DIR}
 
 <|GREEN Execution Group:|> $config{GROUP} ($config{GID})
 <|GREEN Execution User:|>  $config{USER} ($config{UID})