X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fwireless-tools%2FMakefile;h=17b59f841f2ee5749708c801e51f763f7b2bfd54;hb=e240cc0ea62aa7404ccf6187cc95cf6370212bef;hp=fe83163ccd2aad77ccfbb0cbd18c98432be4271f;hpb=e285af3e184318b0fefeab597ae5ee4a2628422d;p=openwrt-10.03%2F.git

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index fe83163cc..17b59f841 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -3,40 +3,55 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-tools
-PKG_VERSION:=28.pre7
+PKG_VERSION:=28
 PKG_RELEASE:=1
-PKG_MD5SUM:=bf598d6ded79e9e6b9bc2dbeb8258f48
 
-PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-	touch $@
+define Package/wireless-tools
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=Tools for manipulating Linux Wireless Extensions
+DESCRIPTION:=Tools for configuring Wireless Adapters implementing the "Wireless Extension"
+URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+endef
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
-		all iwmulticall
+		libiw.so.28 iwmulticall
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		PREFIX="$(PKG_INSTALL_DIR)" \
 		INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
 		INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \
-		install install-iwmulticall
-	touch $@
-
-$(IPKG_WIRELESS_TOOLS):
-	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
-	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
-	$(RSTRIP) $(IDIR_WIRELESS_TOOLS)
-	$(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR)
+		install-iwmulticall
+endef
+
+define Package/wireless-tools/install
+	install -d -m0755  $(1)/usr/lib
+	install -d -m0755 $(1)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/
+	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/
+endef
+
+define Build/InstallDev
+	mkdir -p $(STAGING_DIR)/usr/{lib,include}
+	$(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
+	ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so
+	$(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/
+endef
+	
+define Build/UninstallDev
+	rm -f $(STAGING_DIR)/usr/lib/libiw.*
+	rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h
+endef
+
+$(eval $(call BuildPackage,wireless-tools))