X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a5a74d85bc2c44463e6c05e0a17f0dc6e14582a4..9ba2ec8157bed70ddc64e0c6fe9da5388a46c406:/openwrt/package/mysql/Makefile

diff --git a/openwrt/package/mysql/Makefile b/openwrt/package/mysql/Makefile
index 04f2b27c4..64bb6de2e 100644
--- a/openwrt/package/mysql/Makefile
+++ b/openwrt/package/mysql/Makefile
@@ -94,25 +94,34 @@ $(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):
 	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
+	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/
-	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 \