X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fiw%2FMakefile;h=6db4bdb643140320397c5f01ebcceceb58dd95ef;hp=1118df867000abf04e7c1f857860d0bae6a1a7d2;hb=b896d7c590e4fa27b92ae47f09f3a4d2845824ef;hpb=fa1ec9490aac2342153528a9bc946d969f544593

diff --git a/package/iw/Makefile b/package/iw/Makefile
index 1118df867..6db4bdb64 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,15 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iw
-PKG_REV:=4d3a72da3f21761bf4f2866a6a3400d4ecf67365
-PKG_VERSION:=20080414_$(PKG_REV)
+PKG_VERSION:=0.9.10
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://git.sipsolutions.net/iw.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/
+PKG_MD5SUM:=c820116546768611bb7dd467c2b78483
 PKG_BUILD_DEPENDS:=mac80211 libnl
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,19 +23,19 @@ define Package/iw
   SECTION:=net
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
-  URL:=http://git.sipsolutions.net/?p=iw.git
+  URL:=http://wireless.kernel.org/en/users/Documentation/iw
   DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl
 endef
 
 define Build/Configure
-	$(CP) $(PKG_BUILD_DIR)/defconfig $(PKG_BUILD_DIR)/.config
+	echo "#define IW_VERSION \"$(PKG_VERSION)\"" > $(PKG_BUILD_DIR)/version.h
 endef
 
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl -I$(STAGING_DIR)/usr/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib -lnl"
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS) -lnl"
 
-ifneq ($(CONFIG_LINUX_2_6_23),)
+ifneq ($(CONFIG_LINUX_2_6),)
   define Package/iw/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/