From 2c5470914c170eff4b0a6fb699c119bbe6c8d295 Mon Sep 17 00:00:00 2001
From: dinkypumpkin
Date: Mon, 11 Apr 2011 15:53:39 +0100
Subject: mysql: tidied install dirs, restored mysql.server

1. Added cmake args necessary to link docs, info files, and
shared data into the usual Homebrew locations.  This prevents
all the message catalogues from being spattered in #{share} and
allows the doc and info files to appear in expected places.
2. Restored mysql.server to #{bin} and put it back in caveats.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/mysql.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index d69659cb2..0f80dff47 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -28,6 +28,10 @@ class Mysql < Formula
             "-DCMAKE_INSTALL_PREFIX=#{prefix}",
             "-DMYSQL_DATADIR=#{var}/mysql",
             "-DINSTALL_MANDIR=#{man}",
+            "-DINSTALL_DOCDIR=#{doc}",
+            "-DINSTALL_INFODIR=#{info}",
+            # CMake prepends prefix, so use share.basename
+            "-DINSTALL_MYSQLSHAREDIR=#{share.basename}/#{name}",
             "-DWITH_SSL=yes",
             "-DDEFAULT_CHARSET=utf8",
             "-DDEFAULT_COLLATION=utf8_general_ci",
@@ -61,6 +65,8 @@ class Mysql < Formula
 
     # Link the setup script into bin
     ln_s prefix+'scripts/mysql_install_db', bin+'mysql_install_db'
+    # Link the startup script into bin
+    ln_s "#{prefix}/support-files/mysql.server", bin
   end
 
   def caveats; <<-EOS.undent
@@ -80,7 +86,7 @@ class Mysql < Formula
         sudo mysql_install_db ...options...
 
     Start mysqld manually with:
-        mysqld_safe &
+        mysql.server start
 
     To connect:
         mysql -uroot
-- 
cgit v1.2.3