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

(limited to 'package/libelf')

diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index c176db5ff..135796682 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -72,9 +72,9 @@ $(STAGING_DIR)/usr/lib/libelf.so: $(PKG_BUILD_DIR)/.built
 		install
 
 $(IPKG_LIBELF): $(STAGING_DIR)/usr/lib/libelf.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBELF) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBELF) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBELF)/usr/lib
-	cp -fp $(PKG_BUILD_DIR)/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/
+	cp -fpR $(PKG_BUILD_DIR)/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/
 	$(STRIP) $(IDIR_LIBELF)/usr/lib/lib*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBELF) $(PACKAGE_DIR)
diff --git a/package/libelf/ipkg/libelf.control b/package/libelf/ipkg/libelf.control
new file mode 100644
index 000000000..141b92801
--- /dev/null
+++ b/package/libelf/ipkg/libelf.control
@@ -0,0 +1,6 @@
+Package: libelf
+Priority: optional
+Section: libs
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a library for accessing ELF objects
diff --git a/package/libelf/libelf.control b/package/libelf/libelf.control
deleted file mode 100644
index 141b92801..000000000
--- a/package/libelf/libelf.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: libelf
-Priority: optional
-Section: libs
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: a library for accessing ELF objects
-- 
cgit v1.2.3