[kernel] fix mini_fo on 2.6.25

[openwrt.git] / package / wireless-tools / Makefile

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index e6f2fbc..ceae0f1 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wireless-tools
 PKG_VERSION:=29
 PKG_MINOR:=.pre21
 PKG_NAME:=wireless-tools
 PKG_VERSION:=29
 PKG_MINOR:=.pre21

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION)$(PKG_MINOR).tar.gz
 PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION)$(PKG_MINOR).tar.gz
 PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux


@@ -22,14 +22,32 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+define Package/wireless-tools/Default
+  URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+endef
+

 define Package/wireless-tools
 define Package/wireless-tools

+$(call Package/wireless-tools/Default)

   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Tools for manipulating Linux Wireless Extensions
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Tools for manipulating Linux Wireless Extensions

-  DESCRIPTION:=\
-       This package contains a collection of tools for configuring wireless \\\
-       adapters implementing the "Linux Wireless Extensions".
-  URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+endef
+
+define Package/wireless-tools/description
+ This package contains a collection of tools for configuring wireless
+ adapters implementing the "Linux Wireless Extensions".
+endef
+
+define Package/libiw
+$(call Package/wireless-tools/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for manipulating Linux Wireless Extensions
+endef
+
+define Package/libiw/description
+ This package contains a library for manipulating
+ "Linux Wireless Extensions".

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -47,21 +65,26 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
-       ln -sf libiw.so.$(PKG_VERSION) $(STAGING_DIR)/usr/lib/libiw.so
-endef
-       
-define Build/UninstallDev
-       rm -f   $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \
-               $(STAGING_DIR)/usr/lib/libiw.so*
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libiw.so* $(1)/usr/lib/
+       ln -sf libiw.so.$(PKG_VERSION) $(1)/usr/lib/libiw.so

 endef
 
 define Package/wireless-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin
 endef
 
 define Package/wireless-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iwconfig $(1)/usr/sbin/
+       ln -sf iwconfig $(1)/usr/sbin/iwgetid
+       ln -sf iwconfig $(1)/usr/sbin/iwlist
+       ln -sf iwconfig $(1)/usr/sbin/iwpriv
+       ln -sf iwconfig $(1)/usr/sbin/iwspy
+endef
+
+define Package/libiw/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libiw.so.* $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,wireless-tools))
 endef
 
 $(eval $(call BuildPackage,wireless-tools))

+$(eval $(call BuildPackage,libiw))