[bcm47xx] Stopgap compilation fixes for diag and switch under 2.6.25

[openwrt.git] / package / hostap-utils / Makefile

diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index 3987ac5..bac0d3f 100644 (file)
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -10,42 +10,36 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=hostap-utils
 PKG_VERSION:=0.4.7
 PKG_RELEASE:=1
 PKG_NAME:=hostap-utils
 PKG_VERSION:=0.4.7
 PKG_RELEASE:=1

-PKG_MD5SUM:=afe041581b8f01666e353bec20917c85

 
 

-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=afe041581b8f01666e353bec20917c85

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hostap-utils
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hostap-utils

-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+hostap
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=kmod-hostap

   TITLE:=Host AP driver utility programs
   TITLE:=Host AP driver utility programs

-  DESCRIPTION:=Host AP driver utility programs

   URL:=http://hostap.epitest.fi/
 endef
 
   URL:=http://hostap.epitest.fi/
 endef
 

-

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -Wall" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -Wall" \

                all
 endef
 
 define Package/hostap-utils/install    
                all
 endef
 
 define Package/hostap-utils/install    

-       install -m0755 -d $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/hostap_crypt_conf $(1)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/hostap_diag $(1)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/hostap_io_debug $(1)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/hostap_rid $(1)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/prism2_srec $(1)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/split_combined_hex $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_crypt_conf $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_diag $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_io_debug $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_rid $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prism2_srec $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/split_combined_hex $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,hostap-utils))
 endef
 
 $(eval $(call BuildPackage,hostap-utils))