[malta] include wpad-mini and mac80211_hwsim by default

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

diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index 68afdd2..1d7b221 100644 (file)
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -3,7 +3,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -14,9 +13,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=afe041581b8f01666e353bec20917c85
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,18 +27,18 @@ endef
 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    
-       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))