X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/66bb8975e3f39931c5bf73ecdb15cb6f07e9bcb3..eeacf39870afdb8a0e6cd7a2395b089a732990e2:/package/tcpdump/Makefile

diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index 2b854c828..d174d2fed 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:= \
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 IPKG_TCPDUMP:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 IDIR_TCPDUMP:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
@@ -23,8 +23,8 @@ $(DL_DIR)/$(PKG_SOURCE):
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-	mkdir -p $(BUILD_DIR)/$(PKG_NAME)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR)/$(PKG_NAME) $(TAR_OPTIONS) -
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
 	touch $(PKG_BUILD_DIR)/.prepared
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
@@ -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)