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/Makefile.am     | 1 +
 scripts/mysqlaccess.sh  | 6 +++---
 scripts/mysqld_multi.sh | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 30ba75c551d..0f8e80b4efa 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -111,6 +111,7 @@ SUFFIXES = .sh
 	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
 	  -e 's!@''CC''@!@CC@!'\
 	  -e 's!@''CXX''@!@CXX@!'\
 	  -e 's!@''GXX''@!@GXX@!'\
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");
 }
 
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 4a6f380494f..ce778c03206 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -429,9 +429,9 @@ sub find_groups
   }
   else
   {
-    if (-f "/etc/my.cnf" && -r "/etc/my.cnf")
+    if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
     {
-      open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
+      open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
     }
     for ($i = 0; ($line = shift @tmp); $i++)
     {
@@ -658,7 +658,7 @@ sub example
 #   (as per Linux/Unix standard). You may even replace the
 #   /etc/init.d/mysql.server script with it.
 #
-#   Before using, you must create a my.cnf file either in /etc/my.cnf
+#   Before using, you must create a my.cnf file either in @sysconfdir@/my.cnf
 #   or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
 #
 #   The script can be found from support-files/mysqld_multi.server.sh
-- 
cgit v1.2.1