| 1 |
commit: 8d3e6216d5a32a14c0fe5618b1cf6c8c2d499a0d |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 29 02:24:13 2011 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 29 02:24:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8d3e6216 |
| 7 |
|
| 8 |
[eclass/mysql_fx] Set include and lib dirs to usr/*/mysql - new break reported on bug 375063. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql_fx.eclass | 9 ++------- |
| 12 |
1 files changed, 2 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass |
| 15 |
index c3d7c09..fa7376c 100644 |
| 16 |
--- a/eclass/mysql_fx.eclass |
| 17 |
+++ b/eclass/mysql_fx.eclass |
| 18 |
@@ -229,13 +229,8 @@ mysql_init_vars() { |
| 19 |
MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} |
| 20 |
MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} |
| 21 |
MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} |
| 22 |
- if [[ ${PN} == "mariadb" ]]; then |
| 23 |
- MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} |
| 24 |
- MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} |
| 25 |
- else |
| 26 |
- MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include"} |
| 27 |
- MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)"} |
| 28 |
- fi |
| 29 |
+ MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} |
| 30 |
+ MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} |
| 31 |
|
| 32 |
if [[ -z "${MY_DATADIR}" ]] ; then |
| 33 |
MY_DATADIR="" |
Archives