fix issues with multiple ppp links (noticed by Stefano Rivera)

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

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 39a4ee6..e6f2fbc 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -1,33 +1,44 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-tools
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-tools

-PKG_VERSION:=28
+PKG_VERSION:=29
+PKG_MINOR:=.pre21

 PKG_RELEASE:=1
 
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
-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_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux

-PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
-PKG_CAT:=zcat
+PKG_MD5SUM:=953774d6a34050bae4ef3bfa731f6653
+TAR_OPTIONS += || true

 
 

-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk

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

-SECTION:=base
-CATEGORY:=Network
-DEFAULT:=y
-TITLE:=Tools for manipulating Linux Wireless Extensions
-DESCRIPTION:=Tools for configuring Wireless Adapters implementing the "Wireless Extension"
-URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+  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 Build/Compile
 endef
 
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
-               libiw.so.28 iwmulticall
+       rm -rf $(PKG_INSTALL_DIR)

        mkdir -p $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) -I." \
+               libiw.so.$(PKG_VERSION) iwmulticall

        $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX="$(PKG_INSTALL_DIR)" \
                INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX="$(PKG_INSTALL_DIR)" \
                INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \


@@ -35,19 +46,22 @@ define Build/Compile
                install-iwmulticall
 endef
 
                install-iwmulticall
 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*
+endef
+

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

-       install -d -m0755  $(1)/usr/lib
-       install -d -m0755 $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/
-       install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/

 endef
 
 endef
 

-install-dev: $(PKG_BUILD_DIR)/.built
-       mkdir -p $(STAGING_DIR)/usr/{lib,include}
-       $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
-       ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so
-       $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/
-       
-uninstall-dev:
-       rm -f $(STAGING_DIR)/usr/lib/libiw.*
-       rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h
+$(eval $(call BuildPackage,wireless-tools))