X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1b4100d26b206eb971d681d2340b1e1107611fef..5638c57607fcad22cb321a0c9e621e68f9a15d49:/package/madwifi/Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 8bd6bc1a5..334336469 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -41,8 +41,9 @@ ifeq ($(ARCH),powerpc)
 endif
 
 BUS:=PCI
-ifneq ($(CONFIG_LINUX_2_6_AR531X),)
+ifneq ($(CONFIG_LINUX_2_6_ATHEROS),)
   BUS:=AHB
+  HAL_TARGET:=ap51
 endif
 ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
   BUS:=PCI AHB	# no suitable HAL for AHB yet.
@@ -99,7 +100,7 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
 		TOOLPREFIX="$(KERNEL_CROSS)" \
 		TOOLPATH="$(KERNEL_CROSS)" \
 		KERNELPATH="$(LINUX_DIR)" \
-		LDOPTS=" " \
+		LDOPTS="--no-warn-mismatch " \
 		ATH_RATE="ath_rate/$(RATE_CONTROL)" \
 		DOMULTI=1
 
@@ -115,6 +116,10 @@ ifeq ($(findstring PCI,$(BUS)),PCI)
   endef
 endif
 
+define Build/Configure
+	$(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc
+endef
+
 define Build/Compile
 	$(call Build/Compile/ahb)
 	$(call Build/Compile/pci)
@@ -135,10 +140,9 @@ define Build/UninstallDev
 endef
 
 define KernelPackage/madwifi/install
-	mkdir -p $(1)/etc/init.d
-	mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
-	mkdir -p $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/madwifi.init $(1)/etc/init.d/madwifi
+	$(INSTALL_DIR) $(1)/lib/wifi
+	$(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(1)/usr/sbin/
 endef