From 7526bdf542f54139c70fda3b198a0a45a143045c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 5 Nov 2011 01:42:55 +0100
Subject: [PATCH] wpa_supplicant: install bins to /usr/bin

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/build          | 4 +++-
 packages/network/wpa_supplicant/build   | 2 +-
 packages/network/wpa_supplicant/install | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/network/connman/build b/packages/network/connman/build
index d91bd8074f..1015f250fb 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -22,8 +22,10 @@
 
 . config/options $1
 
+export WPASUPPLICANT="/usr/bin/wpa_supplicant"
+
 cd $PKG_BUILD
-ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
+#ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build
index cbfcf9cb08..77909d5388 100755
--- a/packages/network/wpa_supplicant/build
+++ b/packages/network/wpa_supplicant/build
@@ -30,4 +30,4 @@ cp $ROOT/$PKG_DIR/config/makefile.config .config
 # echo "CONFIG_GNUTLS_EXTRA=y" >> .config
 [ ! "$DEBUG" = "yes" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
 
-make
+make LIBDIR=/usr/lib BINDIR=/usr/bin
diff --git a/packages/network/wpa_supplicant/install b/packages/network/wpa_supplicant/install
index 8b38a06262..4458efd4b4 100755
--- a/packages/network/wpa_supplicant/install
+++ b/packages/network/wpa_supplicant/install
@@ -25,9 +25,9 @@
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d
 
-mkdir -p $INSTALL/sbin
-  cp $PKG_BUILD/wpa_supplicant/wpa_supplicant $INSTALL/sbin
-  cp $PKG_BUILD/wpa_supplicant/wpa_passphrase $INSTALL/sbin
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/wpa_supplicant/wpa_supplicant $INSTALL/usr/bin
+  cp $PKG_BUILD/wpa_supplicant/wpa_passphrase $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/share/dbus-1/system-services
   cp $PKG_BUILD/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services