replace lots of manual install commands with INSTALL_* variables

[openwrt/svn-archive/archive.git] / net / xsupplicant / Makefile

diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile
index c0b980ec6ab95e3230c8c5a972af040a3403e99b..dcbc3441486c35df0bbe5d9df4431684c103e698 100644 (file)
--- a/net/xsupplicant/Makefile
+++ b/net/xsupplicant/Makefile
@@ -20,6 +20,8 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

+PKG_BUILDDEP:=madwifi
+

 include $(INCLUDE_DIR)/package.mk
 
 define Package/xsupplicant
 include $(INCLUDE_DIR)/package.mk
 
 define Package/xsupplicant


@@ -54,16 +56,16 @@ endef
 
 define Build/Compile   
        $(MAKE) -C $(PKG_BUILD_DIR) \
 
 define Build/Compile   
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               DESTDIR=$(PKG_INSTALL_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \

                all install
 endef
 
 define Package/xsupplicant/install     
                all install
 endef
 
 define Package/xsupplicant/install     

-       install -d -m0755 $(1)/etc
-       install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/usr/bin

        $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/

-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin

        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/
 endef