X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/46d9b2065a012d0e95ff0285854d4fdde0904d6b..12c49b6a6adbbcb0c7a19119c8a8c94b5f025f79:/package/libpcap/Makefile

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 4fd1acae1..52a81a183 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -12,13 +12,9 @@ PKG_NAME:=libpcap
 PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -32,41 +28,13 @@ define Package/libpcap
   URL:=http://www.tcpdump.org/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		ac_cv_linux_vers= \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-yydebug \
-			--enable-ipv6 \
-			--with-build-cc="$(HOSTCC)" \
-			--with-pcap=linux \
-	);
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-yydebug \
+	--enable-ipv6 \
+	--with-build-cc="$(HOSTCC)" \
+	--with-pcap=linux
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -85,12 +53,12 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/pcap{,-bpf,-named}.h \
+	rm -rf	$(STAGING_DIR)/usr/include/pcap{,-bpf,-namedb}.h \
 		$(STAGING_DIR)/usr/lib/libpcap.{a,so*}
 endef
 
 define Package/libpcap/install
-	install -m0755 -d $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
 endef