Fix yamonenv errors on accessing environment (#1542)

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

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 064407b..0f790aa 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -12,20 +12,18 @@ PKG_NAME:=wireless-tools
 PKG_VERSION:=28
 PKG_RELEASE:=1
 
 PKG_VERSION:=28
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28

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

-PKG_CAT:=zcat
+TAR_OPTIONS += || true

 
 

-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wireless-tools
   SECTION:=net
   CATEGORY:=Base system
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wireless-tools
   SECTION:=net
   CATEGORY:=Base system

-  DEFAULT:=y

   TITLE:=Tools for manipulating Linux Wireless Extensions
   DESCRIPTION:=\
        This package contains a collection of tools for configuring wireless \\\
   TITLE:=Tools for manipulating Linux Wireless Extensions
   DESCRIPTION:=\
        This package contains a collection of tools for configuring wireless \\\


@@ -56,16 +54,17 @@ define Build/InstallDev
 endef
        
 define Build/UninstallDev
 endef
        
 define Build/UninstallDev

-       rm -f \
-               $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \
+       rm -f   $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \

                $(STAGING_DIR)/usr/lib/libiw.so*
 endef
 
 define Package/wireless-tools/install
                $(STAGING_DIR)/usr/lib/libiw.so*
 endef
 
 define Package/wireless-tools/install

-       install -d -m0755  $(1)/usr/lib
-       install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/
-       install -d -m0755 $(1)/usr/sbin
-       install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/
+       $(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
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/

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