diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-09-10 22:22:01 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-27 18:23:03 +0200 |
| commit | 8a2575d3d7f9d4d19f256608fc997fd7237fd159 (patch) | |
| tree | bababda9b8dd9abc136dbfab24caa3cc898071f9 | |
| parent | 7fdfb6d10d33d16c3f163c7ac2c8f629f097965c (diff) | |
| download | ptxdist-8a2575d3d7f9d4d19f256608fc997fd7237fd159.tar.gz ptxdist-8a2575d3d7f9d4d19f256608fc997fd7237fd159.tar.xz | |
[mysql] targetinstall consolidation
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/mysql.make | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/rules/mysql.make b/rules/mysql.make index 6ef8d4e12..933aecfba 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -302,10 +302,10 @@ $(STATEDIR)/mysql.targetinstall: @$(call targetinfo) @$(call install_init, mysql) - @$(call install_fixup,mysql,PRIORITY,optional) - @$(call install_fixup,mysql,SECTION,base) - @$(call install_fixup,mysql,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - @$(call install_fixup,mysql,DESCRIPTION,missing) + @$(call install_fixup, mysql,PRIORITY,optional) + @$(call install_fixup, mysql,SECTION,base) + @$(call install_fixup, mysql,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, mysql,DESCRIPTION,missing) # # install server stuff # # -------------------- @@ -335,22 +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_copy, mysql, 0, 0, 0644, \ - $(MYSQL_PKGDIR)/usr/lib/mysql/libmysqlclient.so.15.0.0, \ - /usr/lib/libmysqlclient.so.15.0.0) - @$(call install_link, mysql, libmysqlclient.so.15.0.0, \ - /usr/lib/libmysqlclient.so.15) - @$(call install_link, mysql, libmysqlclient.so.15.0.0, \ - /usr/lib/libmysqlclient.so) + @$(call install_lib, mysql, 0, 0, 0644, mysql/libmysqlclient) # # libmyodbc3_r-3.51.27.so uses this library: - @$(call install_copy, mysql, 0, 0, 0644, \ - $(MYSQL_PKGDIR)/usr/lib/mysql/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/libmysqlclient_r.so.15) - @$(call install_link, mysql, libmysqlclient_r.so.15.0.0, \ - /usr/lib/libmysqlclient_r.so) + @$(call install_lib, mysql, 0, 0, 0644, mysql/libmysqlclient_r) ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_MYSQL_STARTSCRIPT @@ -364,7 +352,7 @@ endif endif endif - @$(call install_finish,mysql) + @$(call install_finish, mysql) @$(call touch) |