diff options
| author | Juergen Beisert <j.beisert@pengutronix.de> | 2009-06-30 09:03:53 +0000 |
|---|---|---|
| committer | Juergen Beisert <j.beisert@pengutronix.de> | 2009-06-30 09:03:53 +0000 |
| commit | f51093a6597dcd742be115b59e3a7b4709c92e5f (patch) | |
| tree | ebd23d9ec9298becfbc804183b2883e012efcb54 /rules/mysql.make | |
| parent | 3eaef541583a0c2c9f998a114828319e43e43cb9 (diff) | |
| download | ptxdist-f51093a6597dcd742be115b59e3a7b4709c92e5f.tar.gz ptxdist-f51093a6597dcd742be115b59e3a7b4709c92e5f.tar.xz | |
* mysql: Fix install path for some shared library to
well known locations instead the one the mysql install
stage wants to use (where they are not found at runtime).
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10914 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/mysql.make')
| -rw-r--r-- | rules/mysql.make | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/rules/mysql.make b/rules/mysql.make index 8697b48ad..60e45743c 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -343,20 +343,22 @@ $(STATEDIR)/mysql.targetinstall: @$(call install_copy, mysql, 0, 0, 0755, $(MYSQL_DIR)/client/mysqlcheck, /usr/bin/mysqlcheck) @$(call install_copy, mysql, 0, 0, 0755, $(MYSQL_DIR)/client/mysqldump, /usr/bin/mysqldump) - @$(call install_copy, mysql, 0, 0, 0644, -, \ - /usr/lib/mysql/libmysqlclient.so.15.0.0) + @$(call install_copy, mysql, 0, 0, 0644, \ + $(MYSQL_DIR)/libmysql/.libs/libmysqlclient.so.15.0.0, \ + /usr/lib/libmysqlclient.so.15.0.0) @$(call install_link, mysql, libmysqlclient.so.15.0.0, \ - /usr/lib/mysql/libmysqlclient.so.15) + /usr/lib/libmysqlclient.so.15) @$(call install_link, mysql, libmysqlclient.so.15.0.0, \ - /usr/lib/mysql/libmysqlclient.so) + /usr/lib/libmysqlclient.so) # # libmyodbc3_r-3.51.27.so uses this library: - @$(call install_copy, mysql, 0, 0, 0644, -, \ - /usr/lib/mysql/libmysqlclient_r.so.15.0.0) + @$(call install_copy, mysql, 0, 0, 0644, \ + $(MYSQL_DIR)/libmysql_r/.libs/libmysqlclient_r.so.15.0.0, \ + /usr/lib/libmysqlclient_r.so.15.0.0) @$(call install_link, mysql, libmysqlclient_r.so.15.0.0, \ - /usr/lib/mysql/libmysqlclient_r.so.15) + /usr/lib/libmysqlclient_r.so.15) @$(call install_link, mysql, libmysqlclient_r.so.15.0.0, \ - /usr/lib/mysql/libmysqlclient_r.so) + /usr/lib/libmysqlclient_r.so) ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_MYSQL_STARTSCRIPT |