aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorAdam Vandenberg2013-06-16 08:06:32 -0700
committerAdam Vandenberg2013-06-16 08:06:32 -0700
commit40d59d7009f2f2da1bf277d54831c31be2f4d396 (patch)
tree33e6f82eac866ac893c7aa1d102740b1ae2a89f4 /Library/Formula
parente38784e044e7eb4d437a642aa887876e08042a67 (diff)
downloadhomebrew-40d59d7009f2f2da1bf277d54831c31be2f4d396.tar.bz2
mariadb: my.cnf edits apply to --client-only
Closes #20533.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/mariadb.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb
index 37ba9e154..95a7c353b 100644
--- a/Library/Formula/mariadb.rb
+++ b/Library/Formula/mariadb.rb
@@ -89,6 +89,11 @@ class Mariadb < Formula
system "make"
system "make install"
+ # Fix my.cnf to point to #{etc} instead of /etc
+ inreplace "#{etc}/my.cnf" do |s|
+ s.gsub!("!includedir /etc/my.cnf.d", "!includedir #{etc}/my.cnf.d")
+ end
+
unless build.include? 'client-only'
# Don't create databases inside of the prefix!
# See: https://github.com/mxcl/homebrew/issues/4975
@@ -107,11 +112,6 @@ class Mariadb < Formula
s.gsub!(/pidof/, 'pgrep') if MacOS.version >= :mountain_lion
end
- # Fix my.cnf to point to #{etc} instead of /etc
- inreplace "#{etc}/my.cnf" do |s|
- s.gsub!("!includedir /etc/my.cnf.d", "!includedir #{etc}/my.cnf.d")
- end
-
ln_s "#{prefix}/support-files/mysql.server", bin
end
end