nuke $Id$ in /packages as well

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

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 3ceeaff7158b1554c12989cc8cf2fdc4b32e5bbb..279f5957bc8576bee88e5bbf359ab8d3104f68e5 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -20,9 +19,6 @@ PKG_SOURCE_URL:=\
        http://mysql.holywar.net/Downloads/MySQL-5.0/
 PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
@@ -69,6 +65,8 @@ define Build/Configure
        );
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
@@ -94,24 +92,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/
+       ln -sf $(STAGING_DIR)/usr/bin/mysql_config $(2)/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/
        # NOTE: needed for MySQL-Python
        $(CP) $(PKG_BUILD_DIR)/include/mysqld_error.h $(1)/usr/include/mysql/
-       mkdir -p $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(1)/usr/lib/
        rm -f $(1)/usr/lib/mysql/libmysqlclient.la
 endef
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/bin/mysql_config \
-               $(STAGING_DIR)/usr/include/mysql \
-               $(STAGING_DIR)/usr/lib/mysql
-endef
-
 define Package/libmysqlclient/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/