hostapd: ensure hostapd binaries are installed in the right place

Ensure hostapd and hostapd_cli are installed in /usr/bin/ even if the
directory does not exist.

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index e625d5934b70bfdd699a07f425bd375881d61271..2c24609aee522144b6dab1095c9d713592345c4f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
        compilation, and cache is stored in ~/.buildroot-ccache.
 
        Updated/fixed packages: busybox, dbus, cloop, gdk-pixbuf,
-       libconfig, m4, openssh, openssl, qt, usbutils, xz, zlib
+       hostapd, libconfig, m4, openssh, openssl, qt, usbutils, xz,
+       zlib
 
        New packages: dhrystone, lsuio, rsh-redone, whetstone
 

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 27689b8fc65993e8e70fb68975047a849401fdba..4c9506670fd4bf024b630d271728f585170589f8 100644 (file)
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -74,7 +74,7 @@ define HOSTAPD_CONFIGURE_CMDS
        $(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG)
        $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG)
 # Misc
-       $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG)
+       $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG)
        $(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG)
        $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG)
        $(HOSTAPD_CRYPTO_CONFIG)
@@ -85,10 +85,10 @@ define HOSTAPD_CONFIGURE_CMDS
 endef
 
 define HOSTAPD_INSTALL_TARGET_CMDS
-       $(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
-               $(TARGET_DIR)/usr/sbin
-       $(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \
-               $(TARGET_DIR)/usr/bin
+       $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
+               $(TARGET_DIR)/usr/sbin/hostapd
+       $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \
+               $(TARGET_DIR)/usr/bin/hostapd_cli
 endef
 
 define HOSTAPD_UNINSTALL_TARGET_CMDS