Fix iwconfig symlink generation, closes #3013

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

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 6c511266200e696e6b026e1fd9b3edae5558063a..ff16c065c622fb2aba628712c847bf66aec911f0 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,17 +9,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-tools
-PKG_VERSION:=28
-PKG_RELEASE:=1
+PKG_VERSION:=29
+PKG_MINOR:=.pre21
+PKG_RELEASE:=2
 
-PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
+PKG_SOURCE:=wireless_tools.$(PKG_VERSION)$(PKG_MINOR).tar.gz
 PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
-PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
-PKG_CAT:=zcat
+PKG_MD5SUM:=953774d6a34050bae4ef3bfa731f6653
 TAR_OPTIONS += || true
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,19 +26,21 @@ define Package/wireless-tools
   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 Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -I." \
-               libiw.so.28 iwmulticall
+               libiw.so.$(PKG_VERSION) iwmulticall
        $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX="$(PKG_INSTALL_DIR)" \
                INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
@@ -48,25 +49,20 @@ define Build/Compile
 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.28 $(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)/lib/wifi
-       $(INSTALL_DATA)  ./files/wifi.sh $(1)/lib/wifi/generic.sh
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(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
 
 $(eval $(call BuildPackage,wireless-tools))