X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/057e4cdd71714328318e93a0574c816976452886..715e8021a2c5f52f596196b7e0a7e031443d4ca4:/package/hostapd/Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 3c402ea1c..e500b87bd 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -15,11 +15,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILDDEP:=madwifi
+PKG_BUILD_DEPENDS:=madwifi
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -73,8 +70,8 @@ define Build/CompileTarget
 	$(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
 		$(TARGET_CONFIGURE_OPTS) \
 		OPTFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		hostapd hostapd_cli
 	$(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
 endef
@@ -84,6 +81,8 @@ define Package/InstallTemplate
 		rm -f $(PKG_BUILD_DIR)/.built; \
 		$(MAKE) $(PKG_BUILD_DIR)/.built; \
 	fi
+	$(INSTALL_DIR) $$(1)/lib/wifi
+	$(INSTALL_DATA) ./files/hostapd.sh $$(1)/lib/wifi/hostapd.sh
 	$(INSTALL_DIR) $$(1)/etc
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
 	$(INSTALL_DIR) $$(1)/usr/sbin