X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmysql;h=410dad6c45e1cf5b491b98462605fa7ec3da595b;hb=d94384214e360013d4b43c6a32125d18d9f275ad;hp=d119e43ae3f26864ae3b85913313b772613d44c2;hpb=386325bb1c8319fb953c3bb8a67c60b5c3e27fd0;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/mysql b/lfs/mysql
index d119e43ae3..410dad6c45 100644
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -88,15 +86,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		            --with-unix-socket-path=/var/run/mysql/mysql.sock \
 		            --without-debug \
 		            --without-bench \
+		            --without-readline \
 		            --with-berkeley-db \
 		            --with-extra-charsets=all
-	cd $(DIR_APP) && make testdir=/tmp/mysql
+	cd $(DIR_APP) && make testdir=/tmp/mysql $(MAKETUNING)
 	cd $(DIR_APP) && make testdir=/tmp/mysql install
 	rm -rf /tmp/mysql
 	cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
-	install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
+	install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf
+	mkdir -p /srv/mysql
 	mysql_install_db --user=mysql --force
 	chgrp -v mysql /srv/mysql{,/test,/mysql}
+	chown mysql.mysql /srv/mysql/
 	install -v -m755 -o mysql -g mysql -d /var/run/mysql
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)