more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC)

[openwrt-10.03/.git] / package / wireless-tools / Makefile

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 39a4ee6b66c7d0d5db7340db1e1f645fa98cff95..32e7fc05a94210b5d0b795f31e8a7629db1104d7 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
@@ -12,7 +18,9 @@ PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 PKG_CAT:=zcat
 
-include $(TOPDIR)/package/rules.mk
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
 
 define Package/wireless-tools
 SECTION:=base
@@ -24,10 +32,12 @@ URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 endef
 
 define Build/Compile
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) -I." \
                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" \
@@ -35,19 +45,24 @@ define Build/Compile
                install-iwmulticall
 endef
 
+define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/include
+       $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
+       ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so
+endef
+       
+define Build/UninstallDev
+       rm -f   $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \
+               $(STAGING_DIR)/usr/lib/libiw.so*
+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 -d -m0755 $(1)/usr/sbin
        install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/
 endef
 
-install-dev: $(PKG_BUILD_DIR)/.built
-       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/
-       
-uninstall-dev:
-       rm -f $(STAGING_DIR)/usr/lib/libiw.*
-       rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h
+$(eval $(call BuildPackage,wireless-tools))