fix madwifi mode selection problems

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index bf637bb..f59dadd 100644 (file)
--- 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.
@@ -105,16 +106,20 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
   define Build/Compile/ahb
-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" modules
+       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" LDOPTS="--no-warn-mismatch" modules
   endef
 endif
 
 ifeq ($(findstring PCI,$(BUS)),PCI)
   define Build/Compile/pci
-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" modules
+       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" LDOPTS="--no-warn-mismatch" modules
   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