aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-04-18 22:40:59 +0000
committerNicolas Thill <nico@openwrt.org>2005-04-18 22:40:59 +0000
commit542ea9fa6fa9404642758f86bc8b734ed5013ed4 (patch)
tree8b50f929bd5f4e67b51c18bc61d3f77b02fad22d
parentcfcad6a2be7764e86699856c2ff5c7b681b53796 (diff)
downloadupstream-542ea9fa6fa9404642758f86bc8b734ed5013ed4.tar.gz
upstream-542ea9fa6fa9404642758f86bc8b734ed5013ed4.tar.bz2
upstream-542ea9fa6fa9404642758f86bc8b734ed5013ed4.zip
Change libpcap, uniformize package makefile, put control file in ./ipkg
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@683 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/tcpdump/Makefile11
-rw-r--r--package/tcpdump/ipkg/tcpdump.control (renamed from package/tcpdump/tcpdump.control)0
2 files changed, 6 insertions, 5 deletions
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index 2b854c8285..cf74ea5f17 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -68,10 +68,10 @@ $(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include"
$(IPKG_TCPDUMP): $(PKG_BUILD_DIR)/$(PKG_NAME)
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_TCPDUMP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(IDIR_TCPDUMP)/usr/sbin
- cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_TCPDUMP)/usr/sbin/
- $(STRIP) $(IDIR_TCPDUMP)/usr/sbin/*
+ $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_TCPDUMP) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+ install -m0755 -d $(IDIR_TCPDUMP)/usr/sbin
+ install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_TCPDUMP)/usr/sbin/
+ $(RSTRIP) $(IDIR_TCPDUMP)
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_TCPDUMP) $(PACKAGE_DIR)
@@ -84,4 +84,5 @@ compile: $(IPKG_TCPDUMP)
install: $(INFO_TCPDUMP)
clean:
- rm -rf $(PKG_BUILD_DIR) $(IPKG_TCPDUMP)
+ rm -rf $(PKG_BUILD_DIR)
+ rm -rf $(IPKG_TCPDUMP)
diff --git a/package/tcpdump/tcpdump.control b/package/tcpdump/ipkg/tcpdump.control
index 8817389820..8817389820 100644
--- a/package/tcpdump/tcpdump.control
+++ b/package/tcpdump/ipkg/tcpdump.control