X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/43ccd557c1ba7142727506e1232518d176b0d8a1..01ed40ec23fdac372ea3de50a9bea06fa1a6718f:/package/wpa_supplicant/Makefile?ds=inline

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index b3fec0c12..361a48631 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
-PKG_VERSION:=0.5.5
+PKG_VERSION:=0.5.10
 PKG_RELEASE:=1
-PKG_MD5SUM:=482dd85949c82aa15309e5ab3d2cf5c3
+PKG_MD5SUM:=9e7b99da67c47d81121368c6d580d069
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,19 +23,23 @@ define Package/wpa-supplicant
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=WPA Supplicant
-  DESCRIPTION:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
 
+define Package/wpa-supplicant/Description
+ WPA Supplicant
+endef
 
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=wpa-supplicant
   TITLE:=WPA Supplicant command line interface
-  DESCRIPTION:=
 endef
 
+define Package/wpa-cli/Description
+ 
+endef
 
 define Build/Configure
 	cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
@@ -48,11 +48,12 @@ endef
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
+	CFLAGS="$(TARGET_CFLAGS)" \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		KERNEL=$(LINUX_DIR) \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS=" -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		all
 	$(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
 	$(STRIP) $(PKG_BUILD_DIR)/wpa_cli
@@ -60,12 +61,12 @@ define Build/Compile
 endef
 
 define Package/wpa-supplicant/install
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/wpa_supplicant $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/wpa_{supplicant,passphrase} $(1)/usr/sbin/
 endef
 
 define Package/wpa-cli/install
-	install -m0755 -d $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef