proper error handling in package/Makefile

[openwrt.git] / package / mysql / Makefile

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 04f2b27..055e265 100644 (file)
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -8,11 +8,12 @@ PKG_RELEASE:=2
 PKG_MD5SUM:=408d3001ed715ddc90009c247e548638
 
 PKG_SOURCE_URL:=\
+       http://netmirror.org/mirror/mysql.com/Downloads/MySQL-4.0/ \
        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.holywar.net/Downloads/MySQL-4.0/
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -94,6 +95,11 @@ $(PKG_BUILD_DIR)/.built:
                SUBDIRS="include libmysql" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
+       $(MAKE) -C "$(PKG_BUILD_DIR)" \
+               SUBDIRS="scripts" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               bin_SCRIPTS="mysql_config" \
+               install
        touch $@
 
 $(IPKG_LIBMYSQLCLIENT):
@@ -103,18 +109,22 @@ $(IPKG_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/
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(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/
-       touch $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so
+       rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la
+       touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so
 
 uninstall-dev:
        rm -rf \
+         $(STAGING_DIR)/usr/bin/mysql_config \
          $(STAGING_DIR)/usr/include/mysql \
          $(STAGING_DIR)/usr/lib/mysql \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev