X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibnet-1.0.x%2FMakefile;h=d36a1f5d398d647331944cfb5fb5b78d425c39de;hp=66814b16bd36d69df89b041e77720897825206af;hb=acdb0e81d9f354161b53b74d9e4ca280a7762bf0;hpb=51fb4e32a0a1b74b8a708d4831f5459737cbf19e

diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile
index 66814b16bd..d36a1f5d39 100644
--- a/libs/libnet-1.0.x/Makefile
+++ b/libs/libnet-1.0.x/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -35,6 +34,16 @@ ifeq ($(CONFIG_BIG_ENDIAN),y)
   ENDIANESS:=big
 endif
 
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--with-pf_packet=yes
+
+CONFIGURE_VARS += \
+	ac_cv_libnet_endianess=$(ENDIANESS) \
+	ac_libnet_have_pf_packet=yes \
+	LL_INT_TYPE=sockpacket
+
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); touch \
 		configure.in \
@@ -43,13 +52,7 @@ define Build/Configure
 		Makefile.in \
 		configure \
 	);
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--with-pf_packet=yes, \
-		ac_cv_libnet_endianess=$(ENDIANESS) \
-		ac_libnet_have_pf_packet=yes \
-	)
+	$(call Build/Configure/Default)
 endef
 
 define Build/Compile
@@ -61,20 +64,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/lib/libnet-1.0.x/bin/
-	mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/lib/libnet-1.0.x/include/
-	mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/libnet-1.0.x/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf $(STAGING_DIR)/usr/lib/libnet-1.0.x
+	mkdir -p $(1)/usr/lib/libnet-1.0.x/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/
+	mkdir -p $(1)/usr/lib/libnet-1.0.x/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.0.x/include/
+	mkdir -p $(1)/usr/lib/libnet-1.0.x/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.0.x/lib/
 endef
 
 define Package/libnet0/install
-	install -m0755 -d $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/
 endef