Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

df@kahlann.erinye.com · df@kahlann.erinye.com · commit bb1297cdc3c7 · 2006-12-07T15:13:12.000+01:00
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -115,6 +115,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
@@ -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
@@ -464,9 +464,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++)
     {
@@ -703,7 +703,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

Original file line number	Diff line number	Diff line change
`@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header();`
`462`	`462`	`if (-f "./$script_conf") {`
`463`	`463`	`require "./$script_conf";`
`464`	`464`	`}`
`465`		`- elsif (-f "/etc/$script_conf") {`
`466`		`- require "/etc/$script_conf";`
	`465`	`+ elsif (-f "@sysconfdir@/$script_conf") {`
	`466`	`+ require "@sysconfdir@/$script_conf";`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`# ****************************`
`@@ -929,7 +929,7 @@ sub MergeConfigFile {`
`929`	`929`	`# =================================`
`930`	`930`	`sub MergeConfigFiles {`
`931`	`931`	`my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;`
`932`		`- MergeConfigFile("/etc/my.cnf");`
	`932`	`+ MergeConfigFile("@sysconfdir@/my.cnf");`
`933`	`933`	`MergeConfigFile("$dir/.my.cnf");`
`934`	`934`	`}`
`935`	`935`
Original file line number	Diff line number	Diff line change
`@@ -464,9 +464,9 @@ sub find_groups`
`464`	`464`	`}`
`465`	`465`	`else`
`466`	`466`	`{`
`467`		`- if (-f "/etc/my.cnf" && -r "/etc/my.cnf")`
	`467`	`+ if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")`
`468`	`468`	`{`
`469`		`- open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);`
	`469`	`+ open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);`
`470`	`470`	`}`
`471`	`471`	`for ($i = 0; ($line = shift @tmp); $i++)`
`472`	`472`	`{`
`@@ -703,7 +703,7 @@ sub example`
`703`	`703`	`# (as per Linux/Unix standard). You may even replace the`
`704`	`704`	`# /etc/init.d/mysql.server script with it.`
`705`	`705`	`#`
`706`		`-# Before using, you must create a my.cnf file either in /etc/my.cnf`
	`706`	`+# Before using, you must create a my.cnf file either in @sysconfdir@/my.cnf`
`707`	`707`	`# or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.`
`708`	`708`	`#`
`709`	`709`	`# The script can be found from support-files/mysqld_multi.server.sh`