[brcm-2.4 and brcm47xx] Include missing part of r11275. Fix fw_argX from CFE

[openwrt.git] / package / libpcap / Makefile

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index b2edc1a..d7956a6 100644 (file)
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,12 +22,14 @@ define Package/libpcap
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level packet capture library
-  DESCRIPTION:=\
-       This package contains a system-independent library for user-level \\\
-       network packet capture.
   URL:=http://www.tcpdump.org/
 endef
 
+define Package/libpcap/description
+ This package contains a system-independent library for user-level network 
+ packet capture.
+endef
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -45,17 +46,12 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
+       mkdir -p $(1)/usr/include
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/pcap{,-bpf,-namedb}.h \
-               $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
+               $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \
-               $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/pcap{,-bpf,-named}.h \
-               $(STAGING_DIR)/usr/lib/libpcap.{a,so*}
+               $(1)/usr/lib/
 endef
 
 define Package/libpcap/install