From 1389ac969c689fb5ce449411e63d50536d37ccd1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 5 Nov 2011 01:00:52 +0100
Subject: [PATCH] e2fsprogs: install bins to /usr/bin

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/e2fsprogs/build   |  2 ++
 packages/sysutils/e2fsprogs/install | 38 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/packages/sysutils/e2fsprogs/build b/packages/sysutils/e2fsprogs/build
index 93a7dcb5d5..6e4961d798 100755
--- a/packages/sysutils/e2fsprogs/build
+++ b/packages/sysutils/e2fsprogs/build
@@ -27,6 +27,8 @@ cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
+            --bindir=/usr/bin \
+            --sbindir=/usr/bin \
             --sysconfdir=/etc \
             --enable-verbose-makecmds \
             --enable-symlink-install \
diff --git a/packages/sysutils/e2fsprogs/install b/packages/sysutils/e2fsprogs/install
index 41e7d9399a..699adb350c 100755
--- a/packages/sysutils/e2fsprogs/install
+++ b/packages/sysutils/e2fsprogs/install
@@ -25,23 +25,23 @@
 mkdir -p $INSTALL/etc
   cp $PKG_BUILD/misc/mke2fs.conf $INSTALL/etc
 
-mkdir -p $INSTALL/sbin
-  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/sbin
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
-  cp $PKG_BUILD/misc/mke2fs $INSTALL/sbin
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext2
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext3
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
-  cp $PKG_BUILD/resize/resize2fs $INSTALL/sbin
-  cp $PKG_BUILD/misc/tune2fs $INSTALL/sbin
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/usr/bin
+    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext2
+    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext3
+    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext4
+    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext4dev
+  cp $PKG_BUILD/misc/mke2fs $INSTALL/usr/bin
+    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext2
+    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext3
+    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext4
+    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext4dev
+  cp $PKG_BUILD/resize/resize2fs $INSTALL/usr/bin
+  cp $PKG_BUILD/misc/tune2fs $INSTALL/usr/bin
 
-mkdir -p $INSTALL/lib
-  cp -P $PKG_BUILD/lib/*.so.[0-9] $INSTALL/lib
-  cp -P $PKG_BUILD/lib/e2p/libe2p.so.* $INSTALL/lib
-  cp -P $PKG_BUILD/lib/et/libcom_err.so.* $INSTALL/lib
-  cp -P $PKG_BUILD/lib/ext2fs/libext2fs.so.* $INSTALL/lib
-  cp -P $PKG_BUILD/lib/ss/libss.so.* $INSTALL/lib
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/*.so.[0-9] $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/e2p/libe2p.so.* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/et/libcom_err.so.* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/ext2fs/libext2fs.so.* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/ss/libss.so.* $INSTALL/usr/lib