diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-28 11:30:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-28 11:30:41 +0200 |
| commit | f057ece98fa7a242f0a2773caaec53a60773c982 (patch) | |
| tree | 7d90ee793fae858f930146bcd7394688ee59b693 | |
| parent | 3007a209f62f8a854cb3b15057602445ca0f73dc (diff) | |
| download | ptxdist-f057ece98fa7a242f0a2773caaec53a60773c982.tar.gz ptxdist-f057ece98fa7a242f0a2773caaec53a60773c982.tar.xz | |
[mysql] install libs in /usr/lib
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/mysql-5.1.14-beta/mysql-5.1.14-beta-install-to-usr-lib.diff | 21 | ||||
| -rw-r--r-- | patches/mysql-5.1.14-beta/series | 1 | ||||
| -rw-r--r-- | rules/mysql.make | 4 |
3 files changed, 24 insertions, 2 deletions
diff --git a/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-install-to-usr-lib.diff b/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-install-to-usr-lib.diff new file mode 100644 index 000000000..c5e6d42d5 --- /dev/null +++ b/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-install-to-usr-lib.diff @@ -0,0 +1,21 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Subject: install libs to $(prefix)/lib not $(prefix)/lib/mysql + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + libmysql/Makefile.shared | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/libmysql/Makefile.shared +=================================================================== +--- a/libmysql/Makefile.shared ++++ b/libmysql/Makefile.shared +@@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix) + ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded + ## until someone complains that they need separate options. + LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) +-pkglib_LTLIBRARIES = $(target) ++lib_LTLIBRARIES = $(target) + + noinst_PROGRAMS = conf_to_src + diff --git a/patches/mysql-5.1.14-beta/series b/patches/mysql-5.1.14-beta/series index 75e5f3115..028056fd7 100644 --- a/patches/mysql-5.1.14-beta/series +++ b/patches/mysql-5.1.14-beta/series @@ -2,3 +2,4 @@ mysql-5.0.26_configure.in -p0 mysql-5.0.26_comp_err_gen_lex_hash.diff -p0 mysql-5.0.26_factorial.diff -p0 mysql-5.1.14-beta-query_cache.diff +mysql-5.1.14-beta-install-to-usr-lib.diff diff --git a/rules/mysql.make b/rules/mysql.make index 933aecfba..333443ae8 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -335,10 +335,10 @@ $(STATEDIR)/mysql.targetinstall: @$(call install_copy, mysql, 0, 0, 0755, -, /usr/bin/mysqlcheck) @$(call install_copy, mysql, 0, 0, 0755, -, /usr/bin/mysqldump) - @$(call install_lib, mysql, 0, 0, 0644, mysql/libmysqlclient) + @$(call install_lib, mysql, 0, 0, 0644, libmysqlclient) # # libmyodbc3_r-3.51.27.so uses this library: - @$(call install_lib, mysql, 0, 0, 0644, mysql/libmysqlclient_r) + @$(call install_lib, mysql, 0, 0, 0644, libmysqlclient_r) ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_MYSQL_STARTSCRIPT |