From fb323b6c746abfa2e69973869eae2b995745cbd2 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 18 Apr 2005 06:34:57 +0000
Subject: Uniformize package Makefile, move ipkg related files to ./ipkg

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@665 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/mysql/Makefile                    | 4 ++--
 package/mysql/ipkg/libmysqlclient.control | 7 +++++++
 package/mysql/libmysqlclient.control      | 7 -------
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 package/mysql/ipkg/libmysqlclient.control
 delete mode 100644 package/mysql/libmysqlclient.control

(limited to 'package/mysql')

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 5cca041a0..dfe332f21 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -109,9 +109,9 @@ $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built
 	rm -rf $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la
 
 $(IPKG_LIBMYSQLCLIENT): $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBMYSQLCLIENT) libmysqlclient.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBMYSQLCLIENT) ./ipkg/libmysqlclient.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBMYSQLCLIENT)/usr/lib
-	cp -fp $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
+	cp -fpR $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
 	$(STRIP) $(IDIR_LIBMYSQLCLIENT)/usr/lib/*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR)
diff --git a/package/mysql/ipkg/libmysqlclient.control b/package/mysql/ipkg/libmysqlclient.control
new file mode 100644
index 000000000..29711ab2e
--- /dev/null
+++ b/package/mysql/ipkg/libmysqlclient.control
@@ -0,0 +1,7 @@
+Package: libmysqlclient
+Priority: optional
+Section: libs
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Depends: zlib
+Description: MySQL client library
diff --git a/package/mysql/libmysqlclient.control b/package/mysql/libmysqlclient.control
deleted file mode 100644
index 29711ab2e..000000000
--- a/package/mysql/libmysqlclient.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: libmysqlclient
-Priority: optional
-Section: libs
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Depends: zlib
-Description: MySQL client library
-- 
cgit v1.2.3