[packages] mysql: fix /bin/hostname invocation in table install script, openwrt does...

[openwrt/svn-archive/archive.git] / libs / mysql / Makefile

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index e7a111cb64285b53819b64ea626dfcd21543f2b8..dba90cbad6ff00a302e12bf7105c93b3643b74a0 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mysql
 PKG_VERSION:=5.1.53
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=\
@@ -56,6 +56,8 @@ define Package/libmysqlclient_r
   TITLE += threadsafe
 endef
 
+TARGET_CXX=g++-uc
+
 CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
         CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
@@ -189,6 +191,8 @@ define Package/mysql-server/install
        $(INSTALL_DIR) $(1)/usr/share/mysql/english
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/english/errmsg.sys $(1)/usr/share/mysql/english
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/fill_help_tables.sql $(1)/usr/share/mysql/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables.sql $(1)/usr/share/mysql/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables_data.sql $(1)/usr/share/mysql/
 endef
 
 $(eval $(call BuildPackage,mysql-server))