X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibnet-1.0.x%2FMakefile;h=8d381326a0c7cf6329a9686027bce0c20ddd1924;hb=0f629322ff16e274fe447a2a7fbb2cfbea691c00;hp=dcb21844cd62f8cae0292e5dbaf7c5c8ea1c59df;hpb=ee78cf9e50f88735be838900f3379c3bee8b5d87;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile
index dcb21844cd..8d381326a0 100644
--- a/libs/libnet-1.0.x/Makefile
+++ b/libs/libnet-1.0.x/Makefile
@@ -8,17 +8,15 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libnet
+PKG_NAME:=libnet0
 PKG_VERSION:=1.0.2a
 PKG_RELEASE:=7
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=libnet-$(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
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,14 +33,27 @@ ifeq ($(CONFIG_BIG_ENDIAN),y)
   ENDIANESS:=big
 endif
 
+TARGET_CFLAGS += $(FPIC)
+
+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
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--with-pf_packet=yes, \
-		ac_cv_libnet_endianess=$(ENDIANESS) \
-		ac_libnet_have_pf_packet=yes \
-	)
+	(cd $(PKG_BUILD_DIR); touch \
+		configure.in \
+		include.m4 \
+		aclocal.m4 \
+		Makefile.in \
+		configure \
+	);
+	$(call Build/Configure/Default)
 endef
 
 define Build/Compile
@@ -54,20 +65,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