X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2FMakefile;h=b9dc5d7287b8c020ece14f91bf44afe9347a1972;hb=cc04f0502f503c9d1cca92aed1e861c271c28ff3;hp=bf637bb1d353f7b739dc344d530388dc30cec3ef;hpb=bc385ec4d7a0ecfa34b2844fa12bb8b389d75539;p=openwrt%2Fopenwrt.git

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index bf637bb1d3..b9dc5d7287 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -41,8 +41,9 @@ ifeq ($(ARCH),powerpc)
 endif
 
 BUS:=PCI
-ifneq ($(CONFIG_LINUX_2_4_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,11 +140,10 @@ 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
-	$(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(1)/usr/sbin/
+	$(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,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/
 endef
 
 $(eval $(call KernelPackage,madwifi))