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/libpthread/Makefile                | 6 +++---
 package/libpthread/ipkg/libpthread.control | 6 ++++++
 package/libpthread/libpthread.control      | 6 ------
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 package/libpthread/ipkg/libpthread.control
 delete mode 100644 package/libpthread/libpthread.control

(limited to 'package/libpthread')

diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index c334692f5..7215a450f 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -16,10 +16,10 @@ INFO_LIBPTHREAD:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
 $(IPKG_LIBPTHREAD): $(STAGING_DIR)/lib/libpthread.so
 	rm -rf $(PKG_BUILD_DIR)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPTHREAD) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPTHREAD) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBPTHREAD)/lib
-	cp -fp $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/
-	cp -fp $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/
+	cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/
+	cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/
 	$(STRIP) $(IDIR_LIBPTHREAD)/lib/lib*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR)
diff --git a/package/libpthread/ipkg/libpthread.control b/package/libpthread/ipkg/libpthread.control
new file mode 100644
index 000000000..7037493e8
--- /dev/null
+++ b/package/libpthread/ipkg/libpthread.control
@@ -0,0 +1,6 @@
+Package: libpthread
+Priority: optional
+Section: libs
+Maintainer: Nico <nthill@free.fr>
+Source: buildroot internal
+Description: POSIX threads library
diff --git a/package/libpthread/libpthread.control b/package/libpthread/libpthread.control
deleted file mode 100644
index 7037493e8..000000000
--- a/package/libpthread/libpthread.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: libpthread
-Priority: optional
-Section: libs
-Maintainer: Nico <nthill@free.fr>
-Source: buildroot internal
-Description: POSIX threads library
-- 
cgit v1.2.3