Fix typos and add quotes, potentially fix build failures with ccache (#2533)

[openwrt.git] / package / wpa_supplicant / Makefile

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 658837c..1f798d2 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -15,10 +15,6 @@ PKG_MD5SUM:=bd2436392ad3c6d2513da701a12f2d27
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 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
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -27,19 +23,34 @@ define Package/wpa-supplicant
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=WPA Supplicant
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=WPA Supplicant

-  DESCRIPTION:=WPA Supplicant

   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
 
   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
 
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=wpa-supplicant
   TITLE:=WPA Supplicant command line interface

-  DESCRIPTION:=

 endef
 
 endef
 

+define Package/wpa-cli/Description
+ 
+endef
+
+define Package/wpa-passphrase
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=wpa-supplicant
+  TITLE:=Set WPA passphrase for a SSID
+endef
+
+define Package/wpa-passphrase/Description
+ 
+endef

 
 define Build/Configure
        cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
 
 define Build/Configure
        cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config


@@ -51,8 +62,8 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \
        $(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
                all
        $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
        $(STRIP) $(PKG_BUILD_DIR)/wpa_cli


@@ -69,5 +80,11 @@ define Package/wpa-cli/install
        $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef
 
        $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef
 

+define Package/wpa-passphrase/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_passphrase $(1)/usr/sbin/
+endef
+

 $(eval $(call BuildPackage,wpa-supplicant))
 $(eval $(call BuildPackage,wpa-cli))
 $(eval $(call BuildPackage,wpa-supplicant))
 $(eval $(call BuildPackage,wpa-cli))

+$(eval $(call BuildPackage,wpa-passphrase))