X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ae808b9458159dad37d247932a386dcfaf4b3b1f..ca2745c2818a64722ec0b159cd2a08eaf680652a:/package/madwifi-tools/Makefile

diff --git a/package/madwifi-tools/Makefile b/package/madwifi-tools/Makefile
index a7afde1cf..7ce2608d6 100644
--- a/package/madwifi-tools/Makefile
+++ b/package/madwifi-tools/Makefile
@@ -3,36 +3,48 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=madwifi
-PKG_VERSION:=2005-08-13
+PKG_VERSION:=r1358-20051215
 PKG_RELEASE:=1
-PKG_MD5SUM:=188127127aebd8815595c025a787d729
+PKG_MD5SUM:=0ef00a095359e5af313f52446ebfbbf1
 
-PKG_SOURCE_URL:=http://madwifi.otaku42.de/2005/08/
-PKG_SOURCE:=$(PKG_NAME)-cvs-snapshot-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=http://snapshots.madwifi.org/madwifi-ng
+PKG_SOURCE:=$(PKG_NAME)-ng-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-ng-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,MADWIFI_TOOLS,madwifi-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kmod-madwifi))
+$(eval $(call PKG_template,MADWIFI_TOOLS_BASE,madwifi-tools-base,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kmod-madwifi))
+$(eval $(call PKG_template,MADWIFI_TOOLS_STATS,madwifi-tools-stats,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kmod-madwifi))
 
 $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR)/tools \
-		$(TARGET_CONFIGURE_OPTS)
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		all
 	touch $@
 
-$(IPKG_MADWIFI_TOOLS):
-	mkdir -p $(IDIR_MADWIFI_TOOLS)/usr/sbin
-	cp -fpR $(PKG_BUILD_DIR)/tools/athstats \
+$(IPKG_MADWIFI_TOOLS_BASE):
+	install -d -m0755 $(IDIR_MADWIFI_TOOLS_BASE)/usr/sbin
+	install -m0755 \
+		$(PKG_BUILD_DIR)/tools/athctrl \
+		$(PKG_BUILD_DIR)/tools/athkey \
+		$(PKG_BUILD_DIR)/tools/wlanconfig \
+		$(IDIR_MADWIFI_TOOLS_BASE)/usr/sbin
+	$(RSTRIP) $(IDIR_MADWIFI_TOOLS_BASE)
+	$(IPKG_BUILD) $(IDIR_MADWIFI_TOOLS_BASE) $(PACKAGE_DIR)
+
+$(IPKG_MADWIFI_TOOLS_STATS):
+	install -d -m0755 $(IDIR_MADWIFI_TOOLS_STATS)/usr/sbin
+	install -m0755 \
+		$(PKG_BUILD_DIR)/tools/athstats \
 		$(PKG_BUILD_DIR)/tools/athdebug \
 		$(PKG_BUILD_DIR)/tools/80211stats \
 		$(PKG_BUILD_DIR)/tools/80211debug \
-		$(PKG_BUILD_DIR)/tools/athctrl \
-		$(PKG_BUILD_DIR)/tools/athkey \
-		$(IDIR_MADWIFI_TOOLS)/usr/sbin
-	$(RSTRIP) $(IDIR_MADWIFI_TOOLS)
-	$(IPKG_BUILD) $(IDIR_MADWIFI_TOOLS) $(PACKAGE_DIR)
+		$(IDIR_MADWIFI_TOOLS_STATS)/usr/sbin
+	$(RSTRIP) $(IDIR_MADWIFI_TOOLS_STATS)
+	$(IPKG_BUILD) $(IDIR_MADWIFI_TOOLS_STATS) $(PACKAGE_DIR)