Install mysql_config in STAGING_DIR/usr/bin

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1075 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/mysql/Makefile b/openwrt/package/mysql/Makefile
index 04f2b27..05b8acb 100644 (file)
--- a/openwrt/package/mysql/Makefile
+++ b/openwrt/package/mysql/Makefile
@@ -94,25 +94,33 @@ $(PKG_BUILD_DIR)/.built:
                SUBDIRS="include libmysql" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
                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):
        install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib
        touch $@
 
 $(IPKG_LIBMYSQLCLIENT):
        install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
+       cp -fp $(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
        $(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 -fp $(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/
        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
+       touch $@

 
 install-dev: $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so
 
 uninstall-dev:
        rm -rf \
 
 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 \
 
          $(STAGING_DIR)/usr/include/mysql \
          $(STAGING_DIR)/usr/lib/mysql \