diff options
| author | dinkypumpkin | 2011-04-11 15:53:39 +0100 |
|---|---|---|
| committer | Adam Vandenberg | 2011-04-11 12:05:50 -0700 |
| commit | 2c5470914c170eff4b0a6fb699c119bbe6c8d295 (patch) | |
| tree | 9b380e0fb33a9cf32ee7060687aa8037cc6e81d3 | |
| parent | 99a367ec25c58ebc759eb07a7ef1376c374b1bdd (diff) | |
| download | homebrew-2c5470914c170eff4b0a6fb699c119bbe6c8d295.tar.bz2 | |
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>
| -rw-r--r-- | Library/Formula/mysql.rb | 8 |
1 files changed, 7 insertions, 1 deletions
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 |