X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b3c03528073cc5a1c276717bd837c79436da6c47..82daa5e9c007b2a16aa9e8c5526fd8d034ee4541:/package/mysql/Makefile?ds=sidebyside

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 28d931477..ad6b5297b 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -3,16 +3,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mysql
-PKG_VERSION:=4.0.24
-PKG_RELEASE:=2
-PKG_MD5SUM:=408d3001ed715ddc90009c247e548638
+PKG_VERSION:=5.0.18
+PKG_RELEASE:=1
+PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
 
 PKG_SOURCE_URL:=\
-	http://mysql.he.net/Downloads/MySQL-4.0/ \
-	http://www.linorg.usp.br/mysql/Downloads/MySQL-4.0/ \
-	http://mysql.planetmirror.com/Downloads/MySQL-4.0/ \
-	http://mysql.holywar.net/Downloads/MySQL-4.0/ \
-	http://netmirror.org/mirror/mysql.com/Downloads/MySQL-4.0/
+	http://mysql.planetmirror.com/Downloads/MySQL-5.0/ \
+	http://mysql.he.net/Downloads/MySQL-5.0/ \
+	http://www.linorg.usp.br/mysql/Downloads/MySQL-5.0/ \
+	http://mysql.holywar.net/Downloads/MySQL-5.0/
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -85,13 +85,17 @@ $(PKG_BUILD_DIR)/.configured:
 $(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		SUBDIRS="include" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 	$(MAKE) -C "$(PKG_BUILD_DIR)/libmysql" \
 		CC="$(HOSTCC)" \
 		LINK="$(HOSTCC) -o conf_to_src -lc" \
 		CFLAGS="" \
 		conf_to_src
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="include libmysql" \
+		SUBDIRS="libmysql" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
@@ -103,17 +107,17 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBMYSQLCLIENT):
 	install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBMYSQLCLIENT)
 	$(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/
 	rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la
 	touch $@
 
@@ -125,5 +129,5 @@ uninstall-dev:
 	  $(STAGING_DIR)/usr/include/mysql \
 	  $(STAGING_DIR)/usr/lib/mysql \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev