From c29d22c96dd972c890cce5fc3a27138c50a4ce37 Mon Sep 17 00:00:00 2001
From: unknown <df@kahlann.erinye.com>
Date: Thu, 7 Dec 2006 15:02:32 +0100
Subject: BUG#24780 use --sysconfdir in scripts

scripts/Makefile.am:
  pass --sysconfdir to scripts
scripts/mysqlaccess.sh:
  use --sysconfdir instead of hardcoded /etc
scripts/mysqld_multi.sh:
  use --sysconfdir instead of hardcoded /etc
---
 scripts/mysqlaccess.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/mysqlaccess.sh')

diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 654b43a8a99..22e9d121f9a 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header();
   if (-f "./$script_conf") {
      require "./$script_conf";
   }
-  elsif (-f "/etc/$script_conf") {
-     require "/etc/$script_conf";
+  elsif (-f "@sysconfdir@/$script_conf") {
+     require "@sysconfdir@/$script_conf";
   }
 
 # ****************************
@@ -929,7 +929,7 @@ sub MergeConfigFile {
 # =================================
 sub MergeConfigFiles {
     my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;
-    MergeConfigFile("/etc/my.cnf");
+    MergeConfigFile("@sysconfdir@/my.cnf");
     MergeConfigFile("$dir/.my.cnf");
 }
 
-- 
cgit v1.2.1