From a7d3d46037925a068e4a69474cfbcde10f0fdc47 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 18 Apr 2005 22:40:59 +0000 Subject: [PATCH] Change libpcap, uniformize package makefile, put control file in ./ipkg SVN-Revision: 683 --- openwrt/package/tcpdump/Makefile | 11 ++++++----- openwrt/package/tcpdump/{ => ipkg}/tcpdump.control | 0 2 files changed, 6 insertions(+), 5 deletions(-) rename openwrt/package/tcpdump/{ => ipkg}/tcpdump.control (100%) diff --git a/openwrt/package/tcpdump/Makefile b/openwrt/package/tcpdump/Makefile index 2b854c8285..cf74ea5f17 100644 --- a/openwrt/package/tcpdump/Makefile +++ b/openwrt/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/openwrt/package/tcpdump/tcpdump.control b/openwrt/package/tcpdump/ipkg/tcpdump.control similarity index 100% rename from openwrt/package/tcpdump/tcpdump.control rename to openwrt/package/tcpdump/ipkg/tcpdump.control -- 2.25.1