From 602106cfd84cd5da18ca40df4f7a16b8fb7ff660 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sun, 4 Dec 2016 13:23:46 -0800
Subject: [PATCH] ntfs-3g_ntfsprogs: use unified /usr

---
 .../sysutils/ntfs-3g_ntfsprogs/package.mk     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk
index 492dea6c2d..bee0778159 100644
--- a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk
+++ b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk
@@ -31,7 +31,8 @@ PKG_LONGDESC="The NTFS-3G_ntfsprogs driver is an open source, freely available N
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
+PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \
+                           --disable-dependency-tracking \
                            --disable-library \
                            --enable-posix-acls \
                            --enable-mtab \
@@ -42,11 +43,18 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
 
 post_makeinstall_target() {
   # dont include ntfsprogs.
-  rm -rf $INSTALL/usr/sbin
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/bin/lowntfs-3g
-  rm -rf $INSTALL/sbin/mount.lowntfs-3g
+  for i in $INSTALL/usr/bin/*; do
+    if [ "$(basename $i)" != "ntfs-3g" ]; then
+      rm $i
+    fi
+  done
 
-  mkdir -p $INSTALL/sbin
-    ln -sf /bin/ntfs-3g $INSTALL/sbin/mount.ntfs
+  rm -rf $INSTALL/sbin
+  rm -rf $INSTALL/usr/sbin/ntfsclone
+  rm -rf $INSTALL/usr/sbin/ntfscp
+  rm -rf $INSTALL/usr/sbin/ntfsundelete
+
+  mkdir -p $INSTALL/usr/sbin
+    ln -sf /usr/bin/ntfs-3g $INSTALL/usr/sbin/mount.ntfs
+    ln -sf /usr/sbin/mkntfs $INSTALL/usr/sbin/mkfs.ntfs
 }